Browse code

Renamed PEK/POK to LDZ/STZ

neauoire authored on 11/05/2021 18:14:52
Showing 28 changed files
... ...
@@ -18,10 +18,10 @@ contexts:
18 18
     - match: '\.(\S+)\sDEO'
19 19
       scope:  constant.numeric
20 20
       pop: true
21
-    - match: '\.(\S+)\sPOK2'
21
+    - match: '\.(\S+)\sSTZ2'
22 22
       scope:  constant.numeric
23 23
       pop: true
24
-    - match: '\.(\S+)\sPOK'
24
+    - match: '\.(\S+)\sSTZ'
25 25
       scope:  constant.numeric
26 26
       pop: true
27 27
     - match: '\.(\S+)\sLDA2'
... ...
@@ -37,10 +37,10 @@ contexts:
37 37
     - match: '\.(\S+)\sDEI'
38 38
       scope:  entity.name.type.typedef
39 39
       pop: true
40
-    - match: '\.(\S+)\sPEK2'
40
+    - match: '\.(\S+)\sLDZ2'
41 41
       scope:  entity.name.type.typedef
42 42
       pop: true
43
-    - match: '\.(\S+)\sPEK'
43
+    - match: '\.(\S+)\sLDZ'
44 44
       scope:  entity.name.type.typedef
45 45
       pop: true
46 46
     - match: '\.(\S+)\sSTA2'
... ...
@@ -7,10 +7,10 @@ import P, R, S, C, Ct, Cp, V from require 'lpeg'
7 7
 local labels, filename
8 8
 
9 9
 opcode_translate =
10
-    PEK2: 'LDA'
11
-    POK2: 'STA'
12
-    LDR: 'PEK2'
13
-    STR: 'POK2'
10
+    LDZ2: 'LDA'
11
+    STZ2: 'STA'
12
+    LDR: 'LDZ2'
13
+    STR: 'STZ2'
14 14
     LDR2: 'LDA2'
15 15
     STR2: 'STA2'
16 16
 
... ...
@@ -26,7 +26,7 @@ grammar = P {
26 26
         r, w = if var\sub(1, 1) == var\sub(1, 1)\upper!
27 27
             ' DEI', ' DEO'
28 28
         else
29
-            ' PEK', ' POK'
29
+            ' LDZ', ' STZ'
30 30
         for i = 7, select('#', ...), 6
31 31
             k = select i, ...
32 32
             rr, ww = if '2' == select i + 3, ...
... ...
@@ -41,8 +41,8 @@
41 41
 	;on-mouse .Mouse/vector DEO2
42 42
 
43 43
 	( find center )
44
-	.Screen/width DEI2 2/ .center/x POK2
45
-	.Screen/height DEI2 2/ .center/y POK2
44
+	.Screen/width DEI2 2/ .center/x STZ2
45
+	.Screen/height DEI2 2/ .center/y STZ2
46 46
 
47 47
 	( background ) 
48 48
 	;tiles ;cover-pattern JSR2
... ...
@@ -53,9 +53,9 @@ BRK
53 53
 @on-frame ( -> )
54 54
 
55 55
 	( only draw once per second )
56
-	.DateTime/second DEI .last PEK NEQ #01 JCN [ BRK ]
56
+	.DateTime/second DEI .last LDZ NEQ #01 JCN [ BRK ]
57 57
 
58
-	.DateTime/second DEI .last POK
58
+	.DateTime/second DEI .last STZ
59 59
 
60 60
 	;redraw JSR2
61 61
 
... ...
@@ -66,8 +66,8 @@ BRK
66 66
 	;draw-cursor JSR2
67 67
 
68 68
 	.Mouse/state DEI #00 EQU ,&no-touch JCN
69
-		( incr ) .style PEK INC #03 MOD .style POK
70
-		( bg ) ;tiles .style PEK #10 MUL TOS ADD2 ;cover-pattern JSR2
69
+		( incr ) .style LDZ INC #03 MOD .style STZ
70
+		( bg ) ;tiles .style LDZ #10 MUL TOS ADD2 ;cover-pattern JSR2
71 71
 		( fg ) ;redraw JSR2
72 72
 		( release ) #00 .Mouse/state DEO
73 73
 	&no-touch
... ...
@@ -77,26 +77,26 @@ BRK
77 77
 @redraw ( -- )
78 78
 	
79 79
 	( hrs )
80
-	[ .center/x PEK2 #0018 SUB2 ] 
81
-	[ .center/y PEK2 #0048 SUB2 ] 
80
+	[ .center/x LDZ2 #0018 SUB2 ] 
81
+	[ .center/y LDZ2 #0048 SUB2 ] 
82 82
 	.DateTime/hour DEI #0a DIV ;draw-number JSR2
83
-	[ .center/x PEK2 #0008 ADD2 ] 
84
-	[ .center/y PEK2 #0048 SUB2 ] 
83
+	[ .center/x LDZ2 #0008 ADD2 ] 
84
+	[ .center/y LDZ2 #0048 SUB2 ] 
85 85
 	.DateTime/hour DEI #0a MOD ;draw-number JSR2
86 86
 	( min )
87
-	[ .center/x PEK2 #0018 SUB2 ] 
88
-	[ .center/y PEK2 #0018 SUB2 ] 
87
+	[ .center/x LDZ2 #0018 SUB2 ] 
88
+	[ .center/y LDZ2 #0018 SUB2 ] 
89 89
 	.DateTime/minute DEI #0a DIV ;draw-number JSR2
90
-	[ .center/x PEK2 #0008 ADD2 ] 
91
-	[ .center/y PEK2 #0018 SUB2 ] 
90
+	[ .center/x LDZ2 #0008 ADD2 ] 
91
+	[ .center/y LDZ2 #0018 SUB2 ] 
92 92
 	.DateTime/minute DEI #0a MOD ;draw-number JSR2
93 93
 	( sec )
94
-	[ .center/x PEK2 #0018 SUB2 ] 
95
-	[ .center/y PEK2 #0018 ADD2 ]
94
+	[ .center/x LDZ2 #0018 SUB2 ] 
95
+	[ .center/y LDZ2 #0018 ADD2 ]
96 96
 	.DateTime/second DEI #0a DIV 
97 97
 	;draw-number JSR2
98
-	[ .center/x PEK2 #0008 ADD2 ] 
99
-	[ .center/y PEK2 #0018 ADD2 ] 
98
+	[ .center/x LDZ2 #0008 ADD2 ] 
99
+	[ .center/y LDZ2 #0018 ADD2 ] 
100 100
 	.DateTime/second DEI #0a MOD 
101 101
 	;draw-number JSR2
102 102
 
... ...
@@ -105,15 +105,15 @@ RTN
105 105
 @draw-number ( x y n -- )
106 106
 	
107 107
 	STH
108
-	( save pos ) .anchor/y POK2 .anchor/x POK2
108
+	( save pos ) .anchor/y STZ2 .anchor/x STZ2
109 109
 	#00 #0f
110 110
 	&loop
111
-		( save-x ) OVR #03 MOD TOS #0008 MUL2 .anchor/x PEK2 ADD2 .Screen/x DEO2
112
-		( save-y ) OVR #03 DIV TOS #0008 MUL2 .anchor/y PEK2 ADD2 .Screen/y DEO2
111
+		( save-x ) OVR #03 MOD TOS #0008 MUL2 .anchor/x LDZ2 ADD2 .Screen/x DEO2
112
+		( save-y ) OVR #03 DIV TOS #0008 MUL2 .anchor/y LDZ2 ADD2 .Screen/y DEO2
113 113
 		( get digit* ) OVR DUPr STHr #02 MUL TOS ;digits ADD2 LDA2 
114 114
 		( get bit ) ROT #0e SWP SUB TOS SFT2 #0001 AND2 
115 115
 		( set tile ) #0008 MUL2 ;tiles ADD2 
116
-		( set style ) .style PEK #10 MUL TOS ADD2
116
+		( set style ) .style LDZ #10 MUL TOS ADD2
117 117
 		.Screen/addr DEO2
118 118
 		( draw ) #21 .Screen/color DEO
119 119
 		( incr ) SWP INC SWP 
... ...
@@ -146,15 +146,15 @@ RTN
146 146
 	
147 147
 	( clear last cursor )
148 148
 	;cursor .Screen/addr DEO2 
149
-	.pointer/x PEK2 .Screen/x DEO2 
150
-	.pointer/y PEK2 .Screen/y DEO2 
149
+	.pointer/x LDZ2 .Screen/x DEO2 
150
+	.pointer/y LDZ2 .Screen/y DEO2 
151 151
 	#30 .Screen/color DEO
152 152
 	( record pointer positions )
153
-	.Mouse/x DEI2 .pointer/x POK2 
154
-	.Mouse/y DEI2 .pointer/y POK2
153
+	.Mouse/x DEI2 .pointer/x STZ2 
154
+	.Mouse/y DEI2 .pointer/y STZ2
155 155
 	( draw new cursor )
156
-	.pointer/x PEK2 .Screen/x DEO2 
157
-	.pointer/y PEK2 .Screen/y DEO2 
156
+	.pointer/x LDZ2 .Screen/x DEO2 
157
+	.pointer/y LDZ2 .Screen/y DEO2 
158 158
 	( colorize on state )
159 159
 	#31 [ .Mouse/state DEI #00 NEQ ] ADD .Screen/color DEO
160 160
 
... ...
@@ -81,53 +81,53 @@
81 81
 	#1000 .Audio3/length DEO2
82 82
 
83 83
 	( defaults )
84
-	#01 .modes POK
85
-	#01 .piano/octave POK
84
+	#01 .modes STZ
85
+	#01 .piano/octave STZ
86 86
 
87 87
 	( find center )
88
-	.Screen/width DEI2 #0002 // .center/x POK2
89
-	.Screen/height DEI2 #0002 // .center/y POK2
88
+	.Screen/width DEI2 #0002 // .center/x STZ2
89
+	.Screen/height DEI2 #0002 // .center/y STZ2
90 90
 
91 91
 	( place frame )
92
-	.center/x PEK2 PAD-WIDTH #0003 ** -- #0010 -- .frame/x1 POK2
93
-	.center/y PEK2 #0050 -- .frame/y1 POK2
94
-	.center/x PEK2 PAD-WIDTH #0003 ** ++ #0010 ++ .frame/x2 POK2
95
-	.frame/y1 PEK2 PAD-HEIGHT #0004 ** ++ #0028 ++ .frame/y2 POK2
92
+	.center/x LDZ2 PAD-WIDTH #0003 ** -- #0010 -- .frame/x1 STZ2
93
+	.center/y LDZ2 #0050 -- .frame/y1 STZ2
94
+	.center/x LDZ2 PAD-WIDTH #0003 ** ++ #0010 ++ .frame/x2 STZ2
95
+	.frame/y1 LDZ2 PAD-HEIGHT #0004 ** ++ #0028 ++ .frame/y2 STZ2
96 96
 
97 97
 	( place pad-view )
98
-	.frame/x1 PEK2 .pad-view/x1 POK2
99
-	.frame/y1 PEK2 .pad-view/y1 POK2
100
-	.pad-view/x1 PEK2 #0004 PAD-WIDTH ** ++ .pad-view/x2 POK2
101
-	.pad-view/y1 PEK2 #0004 PAD-HEIGHT ** ++ .pad-view/y2 POK2
98
+	.frame/x1 LDZ2 .pad-view/x1 STZ2
99
+	.frame/y1 LDZ2 .pad-view/y1 STZ2
100
+	.pad-view/x1 LDZ2 #0004 PAD-WIDTH ** ++ .pad-view/x2 STZ2
101
+	.pad-view/y1 LDZ2 #0004 PAD-HEIGHT ** ++ .pad-view/y2 STZ2
102 102
 
103 103
 	( place mix-view )
104
-	.pad-view/x2 PEK2 #0006 ++ .mix-view/x1 POK2
105
-	.pad-view/y1 PEK2 .mix-view/y1 POK2
106
-	.mix-view/x1 PEK2 #007a ++ .mix-view/x2 POK2
107
-	.pad-view/y2 PEK2 .mix-view/y2 POK2
104
+	.pad-view/x2 LDZ2 #0006 ++ .mix-view/x1 STZ2
105
+	.pad-view/y1 LDZ2 .mix-view/y1 STZ2
106
+	.mix-view/x1 LDZ2 #007a ++ .mix-view/x2 STZ2
107
+	.pad-view/y2 LDZ2 .mix-view/y2 STZ2
108 108
 
109 109
 	( place oct-view )
110
-	.frame/x1 PEK2 .oct-view/x1 POK2
111
-	.mix-view/y2 PEK2 #0004 ++ .oct-view/y1 POK2
112
-	.oct-view/x1 PEK2 #0050 ++ .oct-view/x2 POK2
113
-	.oct-view/y1 PEK2 #0018 ++ .oct-view/y2 POK2
110
+	.frame/x1 LDZ2 .oct-view/x1 STZ2
111
+	.mix-view/y2 LDZ2 #0004 ++ .oct-view/y1 STZ2
112
+	.oct-view/x1 LDZ2 #0050 ++ .oct-view/x2 STZ2
113
+	.oct-view/y1 LDZ2 #0018 ++ .oct-view/y2 STZ2
114 114
 
115 115
 	( place wav-view )
116
-	.oct-view/x2 PEK2 .wav-view/x1 POK2
117
-	.mix-view/y2 PEK2 #0004 ++ .wav-view/y1 POK2
118
-	.frame/x2 PEK2 .wav-view/x2 POK2
119
-	.wav-view/y1 PEK2 #0020 ++ .wav-view/y2 POK2
116
+	.oct-view/x2 LDZ2 .wav-view/x1 STZ2
117
+	.mix-view/y2 LDZ2 #0004 ++ .wav-view/y1 STZ2
118
+	.frame/x2 LDZ2 .wav-view/x2 STZ2
119
+	.wav-view/y1 LDZ2 #0020 ++ .wav-view/y2 STZ2
120 120
 
121 121
 	( draw outlines )
122
-	.mix-view/x1 PEK2 #0004 -- 
123
-	.mix-view/y1 PEK2 #0000 -- 
124
-	.mix-view/x2 PEK2 #0002 --
125
-	.mix-view/y2 PEK2 #0002 --
122
+	.mix-view/x1 LDZ2 #0004 -- 
123
+	.mix-view/y1 LDZ2 #0000 -- 
124
+	.mix-view/x2 LDZ2 #0002 --
125
+	.mix-view/y2 LDZ2 #0002 --
126 126
 	#01 ;line-rect JSR2
127
-	.wav-view/x1 PEK2 #0000 -- 
128
-	.wav-view/y1 PEK2 #0002 -- 
129
-	.wav-view/x2 PEK2 #0002 --
130
-	.wav-view/y2 PEK2 #0002 ++
127
+	.wav-view/x1 LDZ2 #0000 -- 
128
+	.wav-view/y1 LDZ2 #0002 -- 
129
+	.wav-view/x2 LDZ2 #0002 --
130
+	.wav-view/y2 LDZ2 #0002 ++
131 131
 	#01 ;line-rect JSR2
132 132
 
133 133
 	( initial draw )
... ...
@@ -155,8 +155,8 @@ BRK
155 155
 	#00 #04
156 156
 	&loop
157 157
 		OVR STH
158
-		( x ) .mix-view/x1 PEK2 #0074 ++
159
-		( y ) .mix-view/y1 PEK2 PAD-HEIGHT DUPr STHr TOS ** ++ #0002 ++
158
+		( x ) .mix-view/x1 LDZ2 #0074 ++
159
+		( y ) .mix-view/y1 LDZ2 PAD-HEIGHT DUPr STHr TOS ** ++ #0002 ++
160 160
 		( output ) .Audio0/output STHr #10 * + DEI 
161 161
 		;draw-monitor JSR2
162 162
 		( incr ) SWP #01 + SWP
... ...
@@ -171,16 +171,16 @@ BRK
171 171
 
172 172
 	.Mouse/state DEI #00 ! #01 JCN [ BRK ]
173 173
 
174
-	.Mouse/x DEI2 DUP2 .pad-view/x1 PEK2 >> ROT ROT .pad-view/x2 PEK2 #0001 ++ << #0101 ==
175
-	.Mouse/y DEI2 DUP2 .pad-view/y1 PEK2 >> ROT ROT .pad-view/y2 PEK2 << #0101 ==
174
+	.Mouse/x DEI2 DUP2 .pad-view/x1 LDZ2 >> ROT ROT .pad-view/x2 LDZ2 #0001 ++ << #0101 ==
175
+	.Mouse/y DEI2 DUP2 .pad-view/y1 LDZ2 >> ROT ROT .pad-view/y2 LDZ2 << #0101 ==
176 176
 	#0101 == ;on-touch-pad JCN2
177 177
 
178
-	.Mouse/x DEI2 DUP2 .mix-view/x1 PEK2 >> ROT ROT .mix-view/x2 PEK2 #0001 ++ << #0101 ==
179
-	.Mouse/y DEI2 DUP2 .mix-view/y1 PEK2 >> ROT ROT .mix-view/y2 PEK2 << #0101 ==
178
+	.Mouse/x DEI2 DUP2 .mix-view/x1 LDZ2 >> ROT ROT .mix-view/x2 LDZ2 #0001 ++ << #0101 ==
179
+	.Mouse/y DEI2 DUP2 .mix-view/y1 LDZ2 >> ROT ROT .mix-view/y2 LDZ2 << #0101 ==
180 180
 	#0101 == ;on-touch-mix JCN2
181 181
 
182
-	.Mouse/x DEI2 DUP2 .oct-view/x1 PEK2 >> ROT ROT .oct-view/x2 PEK2 #0001 ++ << #0101 ==
183
-	.Mouse/y DEI2 DUP2 .oct-view/y1 PEK2 >> ROT ROT .oct-view/y2 PEK2 << #0101 ==
182
+	.Mouse/x DEI2 DUP2 .oct-view/x1 LDZ2 >> ROT ROT .oct-view/x2 LDZ2 #0001 ++ << #0101 ==
183
+	.Mouse/y DEI2 DUP2 .oct-view/y1 LDZ2 >> ROT ROT .oct-view/y2 LDZ2 << #0101 ==
184 184
 	#0101 == ;on-touch-oct JCN2
185 185
 
186 186
 BRK
... ...
@@ -229,8 +229,8 @@ BRK
229 229
 
230 230
 @on-touch-pad ( -> )
231 231
 	
232
-	( x ) .Mouse/x DEI2 .pad-view/x1 PEK2 -- PAD-WIDTH // TOB
233
-	( y ) .Mouse/y DEI2 .pad-view/y1 PEK2 -- PAD-HEIGHT // TOB #04 * +
232
+	( x ) .Mouse/x DEI2 .pad-view/x1 LDZ2 -- PAD-WIDTH // TOB
233
+	( y ) .Mouse/y DEI2 .pad-view/y1 LDZ2 -- PAD-HEIGHT // TOB #04 * +
234 234
 	
235 235
 	DUP SWP ;play-pad JSR2
236 236
 
... ...
@@ -242,8 +242,8 @@ BRK
242 242
 
243 243
 @on-touch-mix ( -> )
244 244
 
245
-	( channel ) .Mouse/y DEI2 .mix-view/y1 PEK2 -- PAD-HEIGHT // TOB STH
246
-	( knob ) .Mouse/x DEI2 .mix-view/x1 PEK2 -- #0010 // TOB
245
+	( channel ) .Mouse/y DEI2 .mix-view/y1 LDZ2 -- PAD-HEIGHT // TOB STH
246
+	( knob ) .Mouse/x DEI2 .mix-view/x1 LDZ2 -- #0010 // TOB
247 247
 	( adsr )
248 248
 	DUP #00 ! ,&no-a JCN
249 249
 		.Audio0/adsr [ DUPr STHr #10 * + ] DEI
... ...
@@ -263,9 +263,9 @@ BRK
263 263
 		.Audio0/adsr [ DUPr STHr #10 * + ] #01 + DEO &no-r
264 264
 	( modes )
265 265
 	DUP #04 ! ,&no-repeat JCN
266
-		.modes [ DUPr STHr + ] PEK 
266
+		.modes [ DUPr STHr + ] LDZ 
267 267
 		#00 =
268
-		.modes [ DUPr STHr + ] POK &no-repeat
268
+		.modes [ DUPr STHr + ] STZ &no-repeat
269 269
 	( volume )
270 270
 	DUP #05 ! ,&no-left JCN
271 271
 		.Audio0/volume [ DUPr STHr #10 * + ] DEI 
... ...
@@ -287,26 +287,26 @@ BRK
287 287
 
288 288
 @on-touch-oct ( -> )
289 289
 	
290
-	.Mouse/x DEI2 .oct-view/x1 PEK2 -- #0008 // TOB #08 ! ,&no-mod JCN
291
-		.Mouse/y DEI2 .oct-view/y1 PEK2 -- #0008 // TOB 
290
+	.Mouse/x DEI2 .oct-view/x1 LDZ2 -- #0008 // TOB #08 ! ,&no-mod JCN
291
+		.Mouse/y DEI2 .oct-view/y1 LDZ2 -- #0008 // TOB 
292 292
 		DUP #00 ! ,&no-incr JCN
293
-			.piano/octave PEK #01 + .piano/octave POK &no-incr
293
+			.piano/octave LDZ #01 + .piano/octave STZ &no-incr
294 294
 		DUP #02 ! ,&no-decr JCN
295
-			.piano/octave PEK #01 - .piano/octave POK &no-decr
295
+			.piano/octave LDZ #01 - .piano/octave STZ &no-decr
296 296
 		POP
297 297
 		( release ) #00 .Mouse/state DEO
298 298
 		;draw-octave JSR2
299 299
 		BRK
300 300
 	&no-mod
301 301
 
302
-	.Mouse/x DEI2 .oct-view/x1 PEK2 -- #0008 // TOB #06 GTH ,&no-key JCN
303
-		.Mouse/x DEI2 .oct-view/x1 PEK2 -- #0008 // 
302
+	.Mouse/x DEI2 .oct-view/x1 LDZ2 -- #0008 // TOB #06 GTH ,&no-key JCN
303
+		.Mouse/x DEI2 .oct-view/x1 LDZ2 -- #0008 // 
304 304
 		( set pitch of pad )
305
-		DUP2 ;notes ++ LDA .pads/last PEK SWP .piano/octave PEK #02 - #0c * + 
305
+		DUP2 ;notes ++ LDA .pads/last LDZ SWP .piano/octave LDZ #02 - #0c * + 
306 306
 		( save ) SWP TOS ;pad-pitch ++ STA 
307 307
 		( record last note )
308
-		TOB .piano/last POK 
309
-		.pads/last PEK ;play-pad JSR2
308
+		TOB .piano/last STZ 
309
+		.pads/last LDZ ;play-pad JSR2
310 310
 		( release ) #00 .Mouse/state DEO
311 311
 		;draw-octave JSR2
312 312
 	&no-key
... ...
@@ -316,8 +316,8 @@ BRK
316 316
 @play-pad ( note pad -- )
317 317
 	
318 318
 	( unselect last )
319
-	.pads/last PEK #01 ;draw-pad JSR2
320
-	DUP .pads/last POK 
319
+	.pads/last LDZ #01 ;draw-pad JSR2
320
+	DUP .pads/last STZ 
321 321
 	( highlight )
322 322
 	DUP #02 ;draw-pad JSR2
323 323
 	( addr )
... ...
@@ -325,7 +325,7 @@ BRK
325 325
 	DUP #04 / #10 * .Audio0/addr + STH2r ROT DEO2
326 326
 	( pitch )
327 327
 	DUP TOS ;pad-pitch ++ LDA STH 
328
-	DUP #04 / .modes + PEK #00 = #80 * STH ADDr
328
+	DUP #04 / .modes + LDZ #00 = #80 * STH ADDr
329 329
 	DUP #04 / #10 * .Audio0/pitch + STHr SWP DEO
330 330
 	#04 / ;draw-mixer JSR2
331 331
 
... ...
@@ -337,25 +337,25 @@ RTN
337 337
 	#02 * #00 SWP ;pad-addr ++ LDA2 STH2
338 338
 
339 339
 	( clear )
340
-	.wav-view/x1 PEK2 #0002 ++
341
-	.wav-view/y1 PEK2
342
-	.wav-view/x2 PEK2 #0002 --
343
-	.wav-view/y2 PEK2
340
+	.wav-view/x1 LDZ2 #0002 ++
341
+	.wav-view/y1 LDZ2
342
+	.wav-view/x2 LDZ2 #0002 --
343
+	.wav-view/y2 LDZ2
344 344
 	#00 ;fill-rect JSR2
345 345
 
346
-	.wav-view/x1 PEK2 #0002 ++ .Screen/x DEO2
346
+	.wav-view/x1 LDZ2 #0002 ++ .Screen/x DEO2
347 347
 
348 348
 	( waveform )
349 349
 	#00 #e8
350 350
 	&loop
351 351
 		( dotted line )
352 352
 		OVR #01 AND ,&no-dot JCN 
353
-			.wav-view/y1 PEK2 #0010 ++ .Screen/y DEO2
353
+			.wav-view/y1 LDZ2 #0010 ++ .Screen/y DEO2
354 354
 			#01 .Screen/color DEO
355 355
 		&no-dot
356 356
 		OVR TOS #0010 ** [ DUP2r STH2r ] ++ LDA 
357 357
 		#02 /
358
-		TOS #0004 // .wav-view/y1 PEK2 ++ .Screen/y DEO2
358
+		TOS #0004 // .wav-view/y1 LDZ2 ++ .Screen/y DEO2
359 359
 		.Screen/x DEI2 #0001 ++ .Screen/x DEO2
360 360
 		( draw ) #02 .Screen/color DEO
361 361
 		( incr ) SWP #01 + SWP
... ...
@@ -367,24 +367,24 @@ RTN
367 367
 
368 368
 @draw-mixer ( mixer -- )
369 369
 
370
-	DUP STH #00 SWP PAD-HEIGHT ** .mix-view/y1 PEK2 ++ #0003 ++
370
+	DUP STH #00 SWP PAD-HEIGHT ** .mix-view/y1 LDZ2 ++ #0003 ++
371 371
 
372 372
 	( adsr )
373
-	DUP2 .mix-view/x1 PEK2 SWP2
373
+	DUP2 .mix-view/x1 LDZ2 SWP2
374 374
 		.Audio0/adsr [ DUPr STHr #10 * + ] DEI #04 SFT ;draw-knob JSR2
375
-	DUP2 .mix-view/x1 PEK2 #0010 ++ SWP2
375
+	DUP2 .mix-view/x1 LDZ2 #0010 ++ SWP2
376 376
 		.Audio0/adsr [ DUPr STHr #10 * + ] DEI #0f AND ;draw-knob JSR2
377
-	DUP2 .mix-view/x1 PEK2 #0020 ++ SWP2
377
+	DUP2 .mix-view/x1 LDZ2 #0020 ++ SWP2
378 378
 		.Audio0/adsr [ DUPr STHr #10 * + ] #01 + DEI #04 SFT ;draw-knob JSR2
379
-	DUP2 .mix-view/x1 PEK2 #0030 ++ SWP2
379
+	DUP2 .mix-view/x1 LDZ2 #0030 ++ SWP2
380 380
 		.Audio0/adsr [ DUPr STHr #10 * + ] #01 + DEI #0f AND ;draw-knob JSR2
381 381
 	( once/repeat )
382
-	DUP2 .mix-view/x1 PEK2 #0040 ++ SWP2
383
-		.modes [ DUPr STHr + ] PEK ;draw-switch JSR2
382
+	DUP2 .mix-view/x1 LDZ2 #0040 ++ SWP2
383
+		.modes [ DUPr STHr + ] LDZ ;draw-switch JSR2
384 384
 	( volume )
385
-	DUP2 .mix-view/x1 PEK2 #0050 ++ SWP2
385
+	DUP2 .mix-view/x1 LDZ2 #0050 ++ SWP2
386 386
 		.Audio0/volume [ DUPr STHr #10 * + ] DEI #04 SFT ;draw-knob JSR2
387
-	DUP2 .mix-view/x1 PEK2 #0060 ++ SWP2
387
+	DUP2 .mix-view/x1 LDZ2 #0060 ++ SWP2
388 388
 		.Audio0/volume [ DUPr STHr #10 * + ] DEI #0f AND ;draw-knob JSR2
389 389
 	POP2
390 390
 	POPr
... ...
@@ -397,8 +397,8 @@ RTN
397 397
 
398 398
 	DUPr STHr 
399 399
 
400
-	DUP #04 / SWP #04 MOD TOS PAD-WIDTH ** ( center ) .pad-view/x1 PEK2 ++ 
401
-	ROT TOS PAD-HEIGHT ** ( center ) .pad-view/y1 PEK2 ++ 
400
+	DUP #04 / SWP #04 MOD TOS PAD-WIDTH ** ( center ) .pad-view/x1 LDZ2 ++ 
401
+	ROT TOS PAD-HEIGHT ** ( center ) .pad-view/y1 LDZ2 ++ 
402 402
 
403 403
 	( draw outline )
404 404
 	OVR2 OVR2 
... ...
@@ -435,28 +435,28 @@ RTN
435 435
 
436 436
 @draw-octave ( -- )
437 437
 	
438
-	.oct-view/x1 PEK2 .oct-view/y1 PEK2
438
+	.oct-view/x1 LDZ2 .oct-view/y1 LDZ2
439 439
 
440
-	OVR2 OVR2 ;keys-left-icns #21 .piano/last PEK #00 = + ;draw-key JSR2
441
-	OVR2 #0008 ++ OVR2 ;keys-middle-icns #21 .piano/last PEK #01 = + ;draw-key JSR2
442
-	OVR2 #0010 ++ OVR2 ;keys-right-icns #21 .piano/last PEK #02 = + ;draw-key JSR2
443
-	OVR2 #0018 ++ OVR2 ;keys-left-icns #21 .piano/last PEK #03 = + ;draw-key JSR2
444
-	OVR2 #0020 ++ OVR2 ;keys-middle-icns #21 .piano/last PEK #04 = + ;draw-key JSR2
445
-	OVR2 #0028 ++ OVR2 ;keys-middle-icns #21 .piano/last PEK #05 = + ;draw-key JSR2
446
-	SWP2 #0030 ++ SWP2 ;keys-right-icns #21 .piano/last PEK #06 = + ;draw-key JSR2
440
+	OVR2 OVR2 ;keys-left-icns #21 .piano/last LDZ #00 = + ;draw-key JSR2
441
+	OVR2 #0008 ++ OVR2 ;keys-middle-icns #21 .piano/last LDZ #01 = + ;draw-key JSR2
442
+	OVR2 #0010 ++ OVR2 ;keys-right-icns #21 .piano/last LDZ #02 = + ;draw-key JSR2
443
+	OVR2 #0018 ++ OVR2 ;keys-left-icns #21 .piano/last LDZ #03 = + ;draw-key JSR2
444
+	OVR2 #0020 ++ OVR2 ;keys-middle-icns #21 .piano/last LDZ #04 = + ;draw-key JSR2
445
+	OVR2 #0028 ++ OVR2 ;keys-middle-icns #21 .piano/last LDZ #05 = + ;draw-key JSR2
446
+	SWP2 #0030 ++ SWP2 ;keys-right-icns #21 .piano/last LDZ #06 = + ;draw-key JSR2
447 447
 
448
-	.oct-view/x1 PEK2 #0040 ++ .Screen/x DEO2
448
+	.oct-view/x1 LDZ2 #0040 ++ .Screen/x DEO2
449 449
 
450 450
 	;arrow-icns .Screen/addr DEO2
451
-	.oct-view/y1 PEK2 .Screen/y DEO2
451
+	.oct-view/y1 LDZ2 .Screen/y DEO2
452 452
 	#21 .Screen/color DEO
453 453
 
454 454
 	;arrow-icns #0008 ++ .Screen/addr DEO2
455
-	.oct-view/y1 PEK2 #0010 ++ .Screen/y DEO2
455
+	.oct-view/y1 LDZ2 #0010 ++ .Screen/y DEO2
456 456
 	#21 .Screen/color DEO
457 457
 
458
-	;font-hex .piano/octave PEK #03 + #00 SWP #0008 ** ++ .Screen/addr DEO2
459
-	.oct-view/y1 PEK2 #0008 ++ .Screen/y DEO2
458
+	;font-hex .piano/octave LDZ #03 + #00 SWP #0008 ** ++ .Screen/addr DEO2
459
+	.oct-view/y1 LDZ2 #0008 ++ .Screen/y DEO2
460 460
 	#23 .Screen/color DEO
461 461
 
462 462
 RTN
... ...
@@ -504,15 +504,15 @@ RTN
504 504
 	
505 505
 	( clear last cursor )
506 506
 	;cursor-icn .Screen/addr DEO2 
507
-	.pointer/x PEK2 .Screen/x DEO2 
508
-	.pointer/y PEK2 .Screen/y DEO2 
507
+	.pointer/x LDZ2 .Screen/x DEO2 
508
+	.pointer/y LDZ2 .Screen/y DEO2 
509 509
 	#30 .Screen/color DEO
510 510
 	( record pointer positions )
511
-	.Mouse/x DEI2 .pointer/x POK2 
512
-	.Mouse/y DEI2 .pointer/y POK2
511
+	.Mouse/x DEI2 .pointer/x STZ2 
512
+	.Mouse/y DEI2 .pointer/y STZ2
513 513
 	( draw new cursor )
514
-	.pointer/x PEK2 .Screen/x DEO2 
515
-	.pointer/y PEK2 .Screen/y DEO2 
514
+	.pointer/x LDZ2 .Screen/x DEO2 
515
+	.pointer/y LDZ2 .Screen/y DEO2 
516 516
 	( colorize on state )
517 517
 	#33 [ .Mouse/state DEI #00 ! ] - .Screen/color DEO
518 518
 
... ...
@@ -564,20 +564,20 @@ RTN
564 564
 
565 565
 @line-rect ( x1* y1* x2* y2* color -- )
566 566
 
567
-	( load ) .color POK DUP2 STH2 .rect/y2 POK2 .rect/x2 POK2 DUP2 STH2 .rect/y1 POK2 .rect/x1 POK2
567
+	( load ) .color STZ DUP2 STH2 .rect/y2 STZ2 .rect/x2 STZ2 DUP2 STH2 .rect/y1 STZ2 .rect/x1 STZ2
568 568
 	STH2r #0001 ++ STH2r
569 569
 	&ver
570 570
 		( save ) OVR2 .Screen/y DEO2
571
-		( draw ) .rect/x1 PEK2 .Screen/x DEO2 .color PEK DUP .Screen/color DEO
572
-		( draw ) .rect/x2 PEK2 .Screen/x DEO2 .Screen/color DEO
571
+		( draw ) .rect/x1 LDZ2 .Screen/x DEO2 .color LDZ DUP .Screen/color DEO
572
+		( draw ) .rect/x2 LDZ2 .Screen/x DEO2 .Screen/color DEO
573 573
 		( incr ) SWP2 #0001 ++ SWP2
574 574
 		OVR2 OVR2 LTS2 ,&ver JCN
575 575
 	POP2 POP2
576
-	.rect/x1 PEK2 #0001 ++ .rect/x2 PEK2 #0001 --
576
+	.rect/x1 LDZ2 #0001 ++ .rect/x2 LDZ2 #0001 --
577 577
 	&hor
578 578
 		( save ) OVR2 .Screen/x DEO2
579
-		( draw ) .rect/y1 PEK2 .Screen/y DEO2 .color PEK DUP .Screen/color DEO
580
-		( draw ) .rect/y2 PEK2 .Screen/y DEO2 .Screen/color DEO
579
+		( draw ) .rect/y1 LDZ2 .Screen/y DEO2 .color LDZ DUP .Screen/color DEO
580
+		( draw ) .rect/y2 LDZ2 .Screen/y DEO2 .Screen/color DEO
581 581
 		( incr ) SWP2 #0001 ++ SWP2
582 582
 		OVR2 OVR2 #0001 ++ LTS2 ,&hor JCN
583 583
 	POP2 POP2
... ...
@@ -601,14 +601,14 @@ RTN
601 601
 
602 602
 @fill-rect ( x1* y1* x2* y2* color -- )
603 603
 	
604
-	.color POK
604
+	.color STZ
605 605
 	( x1 x2 y1 y2 ) ROT2 SWP2
606 606
 	&ver
607 607
 		( save ) OVR2 .Screen/y DEO2
608 608
 		STH2 STH2 OVR2 OVR2
609 609
 		&hor
610 610
 			( save ) OVR2 .Screen/x DEO2
611
-			( draw ) .color PEK .Screen/color DEO
611
+			( draw ) .color LDZ .Screen/color DEO
612 612
 			( incr ) SWP2 #0001 ++ SWP2
613 613
 			OVR2 OVR2 LTS2 ,&hor JCN
614 614
 		POP2 POP2 STH2r STH2r
... ...
@@ -55,20 +55,20 @@
55 55
 	#07 #05 ;set-cell JSR2
56 56
 	#06 #05 ;set-cell JSR2
57 57
 
58
-	.Screen/width DEI2 #0002 // WIDTH TOS -- .anchor/x POK2
59
-	.Screen/height DEI2 #0002 // HEIGHT TOS -- .anchor/y POK2
58
+	.Screen/width DEI2 #0002 // WIDTH TOS -- .anchor/x STZ2
59
+	.Screen/height DEI2 #0002 // HEIGHT TOS -- .anchor/y STZ2
60 60
 
61
-	#01 .world/paused POK
61
+	#01 .world/paused STZ
62 62
 
63 63
 BRK
64 64
 
65 65
 @on-frame ( -> )
66 66
 	
67 67
 	.Mouse/state DEI #00 = #01 JCN [ BRK ]
68
-	.world/paused PEK #00 ! #01 JCN [ BRK ]
68
+	.world/paused LDZ #00 ! #01 JCN [ BRK ]
69 69
 
70
-	( incr frame ) .world/frame PEK INCR [ DUP ] .world/frame POK
71
-	( reset count ) #0000 .world/count POK2
70
+	( incr frame ) .world/frame LDZ INCR [ DUP ] .world/frame STZ
71
+	( reset count ) #0000 .world/count STZ2
72 72
 
73 73
 	#10 MOD #00 ! #01 JCN [ BRK ] 
74 74
 
... ...
@@ -94,9 +94,9 @@ BRK
94 94
 	;draw-grid JSR2
95 95
 
96 96
 	( draw cell count )
97
-	.anchor/x PEK2 .Screen/x DEO2
98
-	.anchor/y PEK2 HEIGHT #02 * TOS ++ .Screen/y DEO2
99
-	.world/count PEK2 #22 ;draw-short JSR2
97
+	.anchor/x LDZ2 .Screen/x DEO2
98
+	.anchor/y LDZ2 HEIGHT #02 * TOS ++ .Screen/y DEO2
99
+	.world/count LDZ2 #22 ;draw-short JSR2
100 100
 
101 101
 BRK
102 102
 
... ...
@@ -104,29 +104,29 @@ BRK
104 104
 	
105 105
 	( clear last cursor )
106 106
 	;cursor .Screen/addr DEO2 
107
-	.pointer/x PEK2 .Screen/x DEO2 
108
-	.pointer/y PEK2 .Screen/y DEO2 
107
+	.pointer/x LDZ2 .Screen/x DEO2 
108
+	.pointer/y LDZ2 .Screen/y DEO2 
109 109
 	#30 .Screen/color DEO
110 110
 
111 111
 	( record pointer positions )
112
-	.Mouse/x DEI2 .pointer/x POK2 
113
-	.Mouse/y DEI2 .pointer/y POK2
112
+	.Mouse/x DEI2 .pointer/x STZ2 
113
+	.Mouse/y DEI2 .pointer/y STZ2
114 114
 
115 115
 	( draw new cursor )
116
-	.pointer/x PEK2 .Screen/x DEO2 
117
-	.pointer/y PEK2 .Screen/y DEO2 
116
+	.pointer/x LDZ2 .Screen/x DEO2 
117
+	.pointer/y LDZ2 .Screen/y DEO2 
118 118
 
119 119
 	( colorize on state )
120 120
 	#32 [ .Mouse/state DEI #00 ! ] + .Screen/color DEO
121 121
 
122 122
 	.Mouse/state DEI #00 ! #01 JCN [ BRK ]
123 123
 
124
-	.Mouse/x DEI2 DUP2 .anchor/x PEK2 >> ROT ROT .anchor/x PEK2 WIDTH #02 * TOS ++ #0001 ++ << #0101 ==
125
-	.Mouse/y DEI2 DUP2 .anchor/y PEK2 >> ROT ROT .anchor/y PEK2 HEIGHT #02 * TOS ++ << #0101 ==
124
+	.Mouse/x DEI2 DUP2 .anchor/x LDZ2 >> ROT ROT .anchor/x LDZ2 WIDTH #02 * TOS ++ #0001 ++ << #0101 ==
125
+	.Mouse/y DEI2 DUP2 .anchor/y LDZ2 >> ROT ROT .anchor/y LDZ2 HEIGHT #02 * TOS ++ << #0101 ==
126 126
 	#0101 == #01 JCN [ BRK ]
127 127
 
128
-	.Mouse/x DEI2 .anchor/x PEK2 SUB2 #02 / TOB
129
-	.Mouse/y DEI2 .anchor/y PEK2 SUB2 #02 / TOB
128
+	.Mouse/x DEI2 .anchor/x LDZ2 SUB2 #02 / TOB
129
+	.Mouse/y DEI2 .anchor/y LDZ2 SUB2 #02 / TOB
130 130
 	;set-cell JSR2
131 131
 	
132 132
 	;draw-grid JSR2
... ...
@@ -138,7 +138,7 @@ BRK
138 138
 	.Controller/key DEI #00 ! #01 JCN [ BRK ]
139 139
 
140 140
 	.Controller/key DEI #20 ! ,&no-toggle JCN
141
-		.world/paused PEK #01 ! .world/paused POK
141
+		.world/paused LDZ #01 ! .world/paused STZ
142 142
 	&no-toggle
143 143
 
144 144
 BRK
... ...
@@ -147,11 +147,11 @@ BRK
147 147
 
148 148
 	#00 HEIGHT
149 149
 	&ver
150
-		OVR TOS #0002 ** .anchor/y PEK2 ++ .Screen/y DEO2
150
+		OVR TOS #0002 ** .anchor/y LDZ2 ++ .Screen/y DEO2
151 151
 		OVR STH
152 152
 		#00 WIDTH
153 153
 		&hor
154
-			OVR TOS #0002 ** .anchor/x PEK2 ++ .Screen/x DEO2
154
+			OVR TOS #0002 ** .anchor/x LDZ2 ++ .Screen/x DEO2
155 155
 			OVR DUPr STHr ,get-cell JSR INCR .Screen/color DEO
156 156
 			SWP INCR SWP
157 157
 			DUP2 ! ,&hor JCN
... ...
@@ -242,7 +242,7 @@ RTN
242 242
 	HEIGHT MOD SWP WIDTH MOD SWP
243 243
 	WIDTH #08 / TOS ROT TOS ** ROT #08 / TOS ++ [ BANK2 ++ ]
244 244
 	( incr count )
245
-	.world/count PEK2 #0001 ADD2 .world/count POK2
245
+	.world/count LDZ2 #0001 ADD2 .world/count STZ2
246 246
 	( save in buffer )
247 247
 	STH2
248 248
 	DUP2 POP #08 MOD #01 SWP SFL 
... ...
@@ -5,7 +5,7 @@
5 5
 %8* { #0008 MUL2 } %8/ { #0008 DIV2 }
6 6
 %++ { #0001 ADD2 }
7 7
 %MOD { DUP2 DIV MUL SUB }
8
-%TRACK { ;track/ch1 #00 .track/active PEK #0020 MUL2 ADD2 }
8
+%TRACK { ;track/ch1 #00 .track/active LDZ #0020 MUL2 ADD2 }
9 9
 
10 10
 ( variables )
11 11
 
... ...
@@ -43,16 +43,16 @@
43 43
 	( vectors ) ;on-mouse .Mouse/vector DEO2
44 44
 	( vectors ) ;on-button .Controller/vector DEO2
45 45
 
46
-	.Screen/width DEI2 #0002 DIV2 DUP2 #0080 SUB2 .trkframe/x1 POK2
47
-	 #0080 ADD2 .trkframe/x2 POK2
48
-	.Screen/height DEI2 #0002 DIV2 DUP2 #0038 SUB2 #0010 SUB2 .trkframe/y1 POK2
49
-	 #0038 ADD2 #0010 SUB2 .trkframe/y2 POK2
46
+	.Screen/width DEI2 #0002 DIV2 DUP2 #0080 SUB2 .trkframe/x1 STZ2
47
+	 #0080 ADD2 .trkframe/x2 STZ2
48
+	.Screen/height DEI2 #0002 DIV2 DUP2 #0038 SUB2 #0010 SUB2 .trkframe/y1 STZ2
49
+	 #0038 ADD2 #0010 SUB2 .trkframe/y2 STZ2
50 50
 
51
-	.trkframe/x1 PEK2 .chnframe/x1 POK2 .trkframe/y2 PEK2 .chnframe/y1 POK2
52
-	.chnframe/x1 PEK2 #0030 ADD2 .chnframe/x2 POK2 .chnframe/y1 PEK2 #0030 ADD2 .chnframe/y2 POK2
51
+	.trkframe/x1 LDZ2 .chnframe/x1 STZ2 .trkframe/y2 LDZ2 .chnframe/y1 STZ2
52
+	.chnframe/x1 LDZ2 #0030 ADD2 .chnframe/x2 STZ2 .chnframe/y1 LDZ2 #0030 ADD2 .chnframe/y2 STZ2
53 53
 
54
-	.chnframe/x2 PEK2 .ctlframe/x1 POK2 .chnframe/y1 PEK2 .ctlframe/y1 POK2
55
-	.trkframe/x2 PEK2 .ctlframe/x2 POK2 .chnframe/y2 PEK2 .ctlframe/y2 POK2
54
+	.chnframe/x2 LDZ2 .ctlframe/x1 STZ2 .chnframe/y1 LDZ2 .ctlframe/y1 STZ2
55
+	.trkframe/x2 LDZ2 .ctlframe/x2 STZ2 .chnframe/y2 LDZ2 .ctlframe/y2 STZ2
56 56
 
57 57
 	( default settings )
58 58
 	#048c .Audio0/adsr DEO2 #88 .Audio0/volume DEO
... ...
@@ -79,7 +79,7 @@ BRK
79 79
 	
80 80
 	;move-head JSR2
81 81
 	;draw-vu JSR2
82
-	.head/pos PEK #08 MOD #00 NEQ ,&skip JCN
82
+	.head/pos LDZ #08 MOD #00 NEQ ,&skip JCN
83 83
 		;bang JSR2
84 84
 	&skip
85 85
 
... ...
@@ -88,14 +88,14 @@ BRK
88 88
 @on-mouse ( -> )
89 89
 
90 90
 	.Mouse/state DEI #00 EQU ;&click-end JCN2
91
-		.Mouse/x DEI2 .trkframe/x1 PEK2 GTH2 .Mouse/x DEI2 .trkframe/x2 PEK2 LTH2 #0101 EQU2
92
-		.Mouse/y DEI2 .trkframe/y1 PEK2 GTH2 .Mouse/y DEI2 .trkframe/y2 PEK2 LTH2 #0101 EQU2
91
+		.Mouse/x DEI2 .trkframe/x1 LDZ2 GTH2 .Mouse/x DEI2 .trkframe/x2 LDZ2 LTH2 #0101 EQU2
92
+		.Mouse/y DEI2 .trkframe/y1 LDZ2 GTH2 .Mouse/y DEI2 .trkframe/y2 LDZ2 LTH2 #0101 EQU2
93 93
 		#0101 EQU2 ;touch-trk JCN2
94
-		.Mouse/x DEI2 .chnframe/x1 PEK2 GTH2 .Mouse/x DEI2 .chnframe/x2 PEK2 LTH2 #0101 EQU2
95
-		.Mouse/y DEI2 .chnframe/y1 PEK2 8+ GTH2 .Mouse/y DEI2 .chnframe/y2 PEK2 8- LTH2 #0101 EQU2
94
+		.Mouse/x DEI2 .chnframe/x1 LDZ2 GTH2 .Mouse/x DEI2 .chnframe/x2 LDZ2 LTH2 #0101 EQU2
95
+		.Mouse/y DEI2 .chnframe/y1 LDZ2 8+ GTH2 .Mouse/y DEI2 .chnframe/y2 LDZ2 8- LTH2 #0101 EQU2
96 96
 		#0101 EQU2 ;touch-chn JCN2
97
-		.Mouse/x DEI2 .ctlframe/x1 PEK2 GTH2 .Mouse/x DEI2 .ctlframe/x2 PEK2 LTH2 #0101 EQU2
98
-		.Mouse/y DEI2 .ctlframe/y1 PEK2 8+ GTH2 .Mouse/y DEI2 .ctlframe/y2 PEK2 8- LTH2 #0101 EQU2
97
+		.Mouse/x DEI2 .ctlframe/x1 LDZ2 GTH2 .Mouse/x DEI2 .ctlframe/x2 LDZ2 LTH2 #0101 EQU2
98
+		.Mouse/y DEI2 .ctlframe/y1 LDZ2 8+ GTH2 .Mouse/y DEI2 .ctlframe/y2 LDZ2 8- LTH2 #0101 EQU2
99 99
 		#0101 EQU2 ;touch-ctl JCN2	
100 100
 	&click-end
101 101
 
... ...
@@ -136,10 +136,10 @@ RTN
136 136
 	
137 137
 	;clear-notes JSR2
138 138
 	( get note )
139
-	#0e .Mouse/y DEI2 .trkframe/y1 PEK2 SUB2 SWP POP #08 DIV SUB
139
+	#0e .Mouse/y DEI2 .trkframe/y1 LDZ2 SUB2 SWP POP #08 DIV SUB
140 140
 	.Mouse/state DEI #10 NEQ ,&no-erase JCN POP #00 &no-erase
141 141
 	( edit note )
142
-	TRACK #00 .Mouse/x DEI2 .trkframe/x1 PEK2 SUB2 SWP POP #08 DIV ADD2 STA
142
+	TRACK #00 .Mouse/x DEI2 .trkframe/x1 LDZ2 SUB2 SWP POP #08 DIV ADD2 STA
143 143
 	( release ) #00 .Mouse/state DEO
144 144
 	;draw-notes JSR2
145 145
 
... ...
@@ -148,7 +148,7 @@ BRK
148 148
 @touch-chn ( -- )
149 149
 	
150 150
 	;clear-notes JSR2
151
-	( save ) .Mouse/y DEI2 .chnframe/y1 PEK2 SUB2 SWP POP #08 DIV #01 SUB .track/active POK
151
+	( save ) .Mouse/y DEI2 .chnframe/y1 LDZ2 SUB2 SWP POP #08 DIV #01 SUB .track/active STZ
152 152
 	( release ) #00 .Mouse/state DEO
153 153
 	;draw-channels JSR2
154 154
 	;draw-notes JSR2
... ...
@@ -158,31 +158,31 @@ BRK
158 158
 
159 159
 @touch-ctl ( -- )
160 160
 	
161
-	.Mouse/x DEI2 .ctlframe/x1 PEK2 SUB2 8- 8/ SWP POP #02 DIV
161
+	.Mouse/x DEI2 .ctlframe/x1 LDZ2 SUB2 8- 8/ SWP POP #02 DIV
162 162
 	DUP #00 NEQ ,&no-a JCN
163
-		.Audio0/adsr .track/active PEK #10 MUL ADD DEI
163
+		.Audio0/adsr .track/active LDZ #10 MUL ADD DEI
164 164
 		#10 .Mouse/state DEI #10 EQU #e0 MUL ADD ADD
165
-		.Audio0/adsr .track/active PEK #10 MUL ADD DEO &no-a
165
+		.Audio0/adsr .track/active LDZ #10 MUL ADD DEO &no-a
166 166
 	DUP #01 NEQ ,&no-d JCN
167
-		.Audio0/adsr .track/active PEK #10 MUL ADD DEI
167
+		.Audio0/adsr .track/active LDZ #10 MUL ADD DEI
168 168
 		DUP #f0 AND STH #01 .Mouse/state DEI #10 EQU #0e MUL ADD ADD #0f AND STHr ADD
169
-		.Audio0/adsr .track/active PEK #10 MUL ADD DEO &no-d
169
+		.Audio0/adsr .track/active LDZ #10 MUL ADD DEO &no-d
170 170
 	DUP #02 NEQ ,&no-s JCN
171
-		.Audio0/adsr .track/active PEK #10 MUL ADD #01 ADD DEI
171
+		.Audio0/adsr .track/active LDZ #10 MUL ADD #01 ADD DEI
172 172
 		#10 .Mouse/state DEI #10 EQU #e0 MUL ADD ADD
173
-		.Audio0/adsr .track/active PEK #10 MUL ADD #01 ADD DEO &no-s
173
+		.Audio0/adsr .track/active LDZ #10 MUL ADD #01 ADD DEO &no-s
174 174
 	DUP #03 NEQ ,&no-r JCN
175
-		.Audio0/adsr .track/active PEK #10 MUL ADD #01 ADD DEI
175
+		.Audio0/adsr .track/active LDZ #10 MUL ADD #01 ADD DEI
176 176
 		DUP #f0 AND STH #01 .Mouse/state DEI #10 EQU #0e MUL ADD ADD #0f AND STHr ADD
177
-		.Audio0/adsr .track/active PEK #10 MUL ADD #01 ADD DEO &no-r
177
+		.Audio0/adsr .track/active LDZ #10 MUL ADD #01 ADD DEO &no-r
178 178
 	DUP #05 NEQ ,&no-left JCN
179
-		.Audio0/volume .track/active PEK #10 MUL ADD DEI
179
+		.Audio0/volume .track/active LDZ #10 MUL ADD DEI
180 180
 		#10 .Mouse/state DEI #10 EQU #e0 MUL ADD ADD
181
-		.Audio0/volume .track/active PEK #10 MUL ADD DEO &no-left
181
+		.Audio0/volume .track/active LDZ #10 MUL ADD DEO &no-left
182 182
 	DUP #06 NEQ ,&no-right JCN
183
-		.Audio0/volume .track/active PEK #10 MUL ADD DEI
183
+		.Audio0/volume .track/active LDZ #10 MUL ADD DEI
184 184
 		DUP #f0 AND STH #01 .Mouse/state DEI #10 EQU #0e MUL ADD ADD #0f AND STHr ADD
185
-		.Audio0/volume .track/active PEK #10 MUL ADD DEO &no-right
185
+		.Audio0/volume .track/active LDZ #10 MUL ADD DEO &no-right
186 186
 	POP
187 187
 	( release ) #00 .Mouse/state DEO
188 188
 	;draw-controls JSR2
... ...
@@ -191,28 +191,28 @@ BRK
191 191
 
192 192
 @bang ( -- )
193 193
 		
194
-	;track/ch1 #00 .head/pos PEK #08 DIV ADD2 LDA
194
+	;track/ch1 #00 .head/pos LDZ #08 DIV ADD2 LDA
195 195
 	#01 SUB
196 196
 	DUP #ff NEQ ,&skip1 JCN
197 197
 		POP ,&listen2 JMP
198 198
 	&skip1
199 199
 	#00 SWP ;notes ADD2 LDA .Audio0/pitch DEO
200 200
 	&listen2
201
-	;track/ch2 #00 .head/pos PEK #08 DIV ADD2 LDA
201
+	;track/ch2 #00 .head/pos LDZ #08 DIV ADD2 LDA
202 202
 	#01 SUB
203 203
 	DUP #ff NEQ ,&skip2 JCN
204 204
 		POP ,&listen3 JMP
205 205
 	&skip2
206 206
 	#00 SWP ;notes ADD2 LDA .Audio1/pitch DEO
207 207
 	&listen3
208
-	;track/ch3 #00 .head/pos PEK #08 DIV ADD2 LDA
208
+	;track/ch3 #00 .head/pos LDZ #08 DIV ADD2 LDA
209 209
 	#01 SUB
210 210
 	DUP #ff NEQ ,&skip3 JCN
211 211
 		POP ,&listen4 JMP
212 212
 	&skip3
213 213
 	#00 SWP ;notes ADD2 LDA .Audio2/pitch DEO
214 214
 	&listen4
215
-	;track/ch4 #00 .head/pos PEK #08 DIV ADD2 LDA
215
+	;track/ch4 #00 .head/pos LDZ #08 DIV ADD2 LDA
216 216
 	#01 SUB
217 217
 	DUP #ff NEQ ,&skip4 JCN
218 218
 		POP ,&end JMP
... ...
@@ -225,14 +225,14 @@ RTN
225 225
 @move-head ( -- )
226 226
 
227 227
 	( clear )
228
-	.trkframe/y1 PEK2 8- .Screen/y DEO2
229
-	.trkframe/x1 PEK2 #00 .head/pos PEK ADD2 .Screen/x DEO2
228
+	.trkframe/y1 LDZ2 8- .Screen/y DEO2
229
+	.trkframe/x1 LDZ2 #00 .head/pos LDZ ADD2 .Screen/x DEO2
230 230
 	;head_icn .Screen/addr DEO2
231 231
 	#20 .Screen/color DEO
232
-	( incr ) .head/pos PEK #01 ADD .head/pos POK
233
-	.trkframe/x1 PEK2 #00 .head/pos PEK ADD2 .Screen/x DEO2
232
+	( incr ) .head/pos LDZ #01 ADD .head/pos STZ
233
+	.trkframe/x1 LDZ2 #00 .head/pos LDZ ADD2 .Screen/x DEO2
234 234
 	;head_icn .Screen/addr DEO2
235
-	#21 ( if note ) TRACK #00 .head/pos PEK #08 DIV ADD2 LDA #00 NEQ ADD .Screen/color DEO
235
+	#21 ( if note ) TRACK #00 .head/pos LDZ #08 DIV ADD2 LDA #00 NEQ ADD .Screen/color DEO
236 236
 
237 237
 RTN
238 238
 
... ...
@@ -241,8 +241,8 @@ RTN
241 241
 	#00 #20
242 242
 	&loop
243 243
 		( load ) OVR #00 SWP TRACK ADD2 LDA
244
-		DUP STH #00 SWP #0e SWP SUB 8* .trkframe/y1 PEK2 ADD2 .Screen/y DEO2
245
-		OVR #00 SWP 8* .trkframe/x1 PEK2 ADD2 .Screen/x DEO2
244
+		DUP STH #00 SWP #0e SWP SUB 8* .trkframe/y1 LDZ2 ADD2 .Screen/y DEO2
245
+		OVR #00 SWP 8* .trkframe/x1 LDZ2 ADD2 .Screen/x DEO2
246 246
 		STHr #00 EQU ,&skip JCN
247 247
 			#20 .Screen/color DEO
248 248
 		&skip
... ...
@@ -257,8 +257,8 @@ RTN
257 257
 	#00 #20
258 258
 	&notes-loop
259 259
 		( load ) OVR #00 SWP TRACK ADD2 LDA
260
-		DUP STH #00 SWP #0e SWP SUB 8* .trkframe/y1 PEK2 ADD2 .Screen/y DEO2
261
-		OVR #00 SWP 8* .trkframe/x1 PEK2 ADD2 .Screen/x DEO2
260
+		DUP STH #00 SWP #0e SWP SUB 8* .trkframe/y1 LDZ2 ADD2 .Screen/y DEO2
261
+		OVR #00 SWP 8* .trkframe/x1 LDZ2 ADD2 .Screen/x DEO2
262 262
 		;note_icn .Screen/addr DEO2
263 263
 		STHr #00 EQU ,&skip JCN
264 264
 			#25 .Screen/color DEO
... ...
@@ -272,27 +272,27 @@ RTN
272 272
 
273 273
 @draw-bars ( -- )
274 274
 
275
-	.trkframe/x1 PEK2 .trkframe/y1 PEK2 .trkframe/x2 PEK2 .trkframe/y2 PEK2 #01 ;line-rect JSR2
275
+	.trkframe/x1 LDZ2 .trkframe/y1 LDZ2 .trkframe/x2 LDZ2 .trkframe/y2 LDZ2 #01 ;line-rect JSR2
276 276
 
277 277
 	( grid )
278
-	.trkframe/y1 PEK2 #0010 SUB2 .Screen/y DEO2
278
+	.trkframe/y1 LDZ2 #0010 SUB2 .Screen/y DEO2
279 279
 	;font_hex .Screen/addr DEO2
280 280
 	#0000 #0100
281 281
 	&loop
282 282
 		OVR2 SWP POP #02 DIV #0f AND #00 NEQ ,&skip JCN
283
-			OVR2 .trkframe/x1 PEK2 ADD2 .Screen/x DEO2
284
-			.trkframe/y1 PEK2 #0010 SUB2 .Screen/y DEO2
283
+			OVR2 .trkframe/x1 LDZ2 ADD2 .Screen/x DEO2
284
+			.trkframe/y1 LDZ2 #0010 SUB2 .Screen/y DEO2
285 285
 			#22 .Screen/color DEO
286 286
 			.Screen/addr DEI2 8+ .Screen/addr DEO2
287
-			OVR2 .trkframe/x1 PEK2 ADD2 .trkframe/y1 PEK2 ++ .trkframe/y2 PEK2 #01 ;line-vertical-dotted JSR2
287
+			OVR2 .trkframe/x1 LDZ2 ADD2 .trkframe/y1 LDZ2 ++ .trkframe/y2 LDZ2 #01 ;line-vertical-dotted JSR2
288 288
 		&skip
289
-		OVR2 .trkframe/x1 PEK2 ADD2 .trkframe/y1 PEK2 .trkframe/y2 PEK2 #01 ;line-vertical-dotted JSR2
289
+		OVR2 .trkframe/x1 LDZ2 ADD2 .trkframe/y1 LDZ2 .trkframe/y2 LDZ2 #01 ;line-vertical-dotted JSR2
290 290
 		SWP2 8+ SWP2
291 291
 		OVR2 OVR2 LTH2 ,&loop JCN
292 292
 	POP2
293 293
 	POP2
294 294
 
295
-	.trkframe/x1 PEK2 .trkframe/x2 PEK2 .trkframe/y1 PEK2 8- #0040 ADD2 #01 ;line-horizontal-dotted JSR2
295
+	.trkframe/x1 LDZ2 .trkframe/x2 LDZ2 .trkframe/y1 LDZ2 8- #0040 ADD2 #01 ;line-horizontal-dotted JSR2
296 296
 
297 297
 RTN
298 298
 
... ...
@@ -319,20 +319,20 @@ RTN
319 319
 
320 320
 @draw-octaves ( -- )
321 321
 	
322
-	.trkframe/x1 PEK2 #0018 SUB2 DUP2 .trkframe/y1 PEK2 ;draw-octave JSR2
323
-	.trkframe/y1 PEK2 #0038 ADD2 ;draw-octave JSR2
324
-	.trkframe/x1 PEK2 #0028 SUB2 .Screen/x DEO2
325
-	.trkframe/y1 PEK2 #0030 ADD2 .Screen/y DEO2
322
+	.trkframe/x1 LDZ2 #0018 SUB2 DUP2 .trkframe/y1 LDZ2 ;draw-octave JSR2
323
+	.trkframe/y1 LDZ2 #0038 ADD2 ;draw-octave JSR2
324
+	.trkframe/x1 LDZ2 #0028 SUB2 .Screen/x DEO2
325
+	.trkframe/y1 LDZ2 #0030 ADD2 .Screen/y DEO2
326 326
 	;font_hex #0020 ADD2 .Screen/addr DEO2
327 327
 	#23 .Screen/color DEO
328
-	.trkframe/x1 PEK2 #0030 SUB2 .Screen/x DEO2
328
+	.trkframe/x1 LDZ2 #0030 SUB2 .Screen/x DEO2
329 329
 	;font_hex #0060 ADD2 .Screen/addr DEO2
330 330
 	#23 .Screen/color DEO
331
-	.trkframe/x1 PEK2 #0028 SUB2 .Screen/x DEO2
332
-	.trkframe/y1 PEK2 #0068 ADD2 .Screen/y DEO2
331
+	.trkframe/x1 LDZ2 #0028 SUB2 .Screen/x DEO2
332
+	.trkframe/y1 LDZ2 #0068 ADD2 .Screen/y DEO2
333 333
 	;font_hex #0018 ADD2 .Screen/addr DEO2
334 334
 	#23 .Screen/color DEO
335
-	.trkframe/x1 PEK2 #0030 SUB2 .Screen/x DEO2
335
+	.trkframe/x1 LDZ2 #0030 SUB2 .Screen/x DEO2
336 336
 	;font_hex #0060 ADD2 .Screen/addr DEO2
337 337
 	#23 .Screen/color DEO
338 338
 
... ...
@@ -346,74 +346,74 @@ RTN
346 346
 RTN
347 347
 
348 348
 @draw-knob ( x* y* value -- )
349
-	.track/active PEK #03 EQU ;&blank JCN2
349
+	.track/active LDZ #03 EQU ;&blank JCN2
350 350
 
351 351
 	&force
352
-	( load ) .knob/value POK .knob/y POK2 .knob/x POK2
353
-
354
-	.knob/x PEK2 .Screen/x DEO2
355
-	.knob/y PEK2 .Screen/y DEO2 ;knob_icns .Screen/addr DEO2 #21 .Screen/color DEO
356
-	.knob/x PEK2 8+ .Screen/x DEO2 ;knob_icns 8+ .Screen/addr DEO2 #21 .Screen/color DEO
357
-	.knob/y PEK2 8+ .Screen/y DEO2 ;knob_icns #0018 ADD2 .Screen/addr DEO2 #21 .Screen/color DEO
358
-	.knob/x PEK2 .Screen/x DEO2 ;knob_icns #0010 ADD2 .Screen/addr DEO2 #21 .Screen/color DEO
359
-	.knob/x PEK2 #00 #00 .knob/value PEK ;knob_offsetx ADD2 LDA ADD2 .Screen/x DEO2
360
-	.knob/y PEK2 #00 #00 .knob/value PEK ;knob_offsety ADD2 LDA ADD2 .Screen/y DEO2
352
+	( load ) .knob/value STZ .knob/y STZ2 .knob/x STZ2
353
+
354
+	.knob/x LDZ2 .Screen/x DEO2
355
+	.knob/y LDZ2 .Screen/y DEO2 ;knob_icns .Screen/addr DEO2 #21 .Screen/color DEO
356
+	.knob/x LDZ2 8+ .Screen/x DEO2 ;knob_icns 8+ .Screen/addr DEO2 #21 .Screen/color DEO
357
+	.knob/y LDZ2 8+ .Screen/y DEO2 ;knob_icns #0018 ADD2 .Screen/addr DEO2 #21 .Screen/color DEO
358
+	.knob/x LDZ2 .Screen/x DEO2 ;knob_icns #0010 ADD2 .Screen/addr DEO2 #21 .Screen/color DEO
359
+	.knob/x LDZ2 #00 #00 .knob/value LDZ ;knob_offsetx ADD2 LDA ADD2 .Screen/x DEO2
360
+	.knob/y LDZ2 #00 #00 .knob/value LDZ ;knob_offsety ADD2 LDA ADD2 .Screen/y DEO2
361 361
 	;knob_icns #0020 ADD2 .Screen/addr DEO2
362 362
 	#25 .Screen/color DEO
363
-	.knob/x PEK2 #0004 ADD2 .Screen/x DEO2
364
-	.knob/y PEK2 #0010 ADD2 .Screen/y DEO2
365
-	;font_hex #00 .knob/value PEK #08 MUL ADD2 .Screen/addr DEO2
363
+	.knob/x LDZ2 #0004 ADD2 .Screen/x DEO2
364
+	.knob/y LDZ2 #0010 ADD2 .Screen/y DEO2
365
+	;font_hex #00 .knob/value LDZ #08 MUL ADD2 .Screen/addr DEO2
366 366
 	#21 .Screen/color DEO
367 367
 
368 368
 RTN
369 369
 
370 370
 	&blank
371 371
 
372
-	( load ) .knob/value POK .knob/y POK2 .knob/x POK2
372
+	( load ) .knob/value STZ .knob/y STZ2 .knob/x STZ2
373 373
 
374
-	.knob/x PEK2 .Screen/x DEO2
375
-	.knob/y PEK2 .Screen/y DEO2 #20 .Screen/color DEO
376
-	.knob/x PEK2 8+ .Screen/x DEO2 #20 .Screen/color DEO
377
-	.knob/y PEK2 8+ .Screen/y DEO2 #20 .Screen/color DEO
378
-	.knob/x PEK2 .Screen/x DEO2 #20 .Screen/color DEO
379
-	.knob/x PEK2 #0004 ADD2 .Screen/x DEO2
380
-	.knob/y PEK2 #0010 ADD2 .Screen/y DEO2
374
+	.knob/x LDZ2 .Screen/x DEO2
375
+	.knob/y LDZ2 .Screen/y DEO2 #20 .Screen/color DEO
376
+	.knob/x LDZ2 8+ .Screen/x DEO2 #20 .Screen/color DEO
377
+	.knob/y LDZ2 8+ .Screen/y DEO2 #20 .Screen/color DEO
378
+	.knob/x LDZ2 .Screen/x DEO2 #20 .Screen/color DEO
379
+	.knob/x LDZ2 #0004 ADD2 .Screen/x DEO2
380
+	.knob/y LDZ2 #0010 ADD2 .Screen/y DEO2
381 381
 	#20 .Screen/color DEO
382 382
 RTN
383 383
 
384 384
 @draw-controls ( -- )
385 385
 	
386
-	.ctlframe/x1 PEK2 .ctlframe/y1 PEK2 .ctlframe/x2 PEK2 .ctlframe/y2 PEK2 #01 ;line-rect JSR2
386
+	.ctlframe/x1 LDZ2 .ctlframe/y1 LDZ2 .ctlframe/x2 LDZ2 .ctlframe/y2 LDZ2 #01 ;line-rect JSR2
387 387
 	( env )
388
-	.ctlframe/x1 PEK2 8+ .ctlframe/y1 PEK2 8+ #22 ;env_txt ;draw-label JSR2
389
-	.ctlframe/x1 PEK2 8+ .ctlframe/y1 PEK2 #0010 ADD2
390
-		.Audio0/adsr .track/active PEK #10 MUL ADD DEI #04 SFT
388
+	.ctlframe/x1 LDZ2 8+ .ctlframe/y1 LDZ2 8+ #22 ;env_txt ;draw-label JSR2
389
+	.ctlframe/x1 LDZ2 8+ .ctlframe/y1 LDZ2 #0010 ADD2
390
+		.Audio0/adsr .track/active LDZ #10 MUL ADD DEI #04 SFT
391 391
 		;draw-knob JSR2
392
-	.ctlframe/x1 PEK2 #0018 ADD2 .ctlframe/y1 PEK2 #0010 ADD2
393
-		.Audio0/adsr .track/active PEK #10 MUL ADD DEI #0f AND
392
+	.ctlframe/x1 LDZ2 #0018 ADD2 .ctlframe/y1 LDZ2 #0010 ADD2
393
+		.Audio0/adsr .track/active LDZ #10 MUL ADD DEI #0f AND
394 394
 		;draw-knob JSR2
395
-	.ctlframe/x1 PEK2 #0028 ADD2 .ctlframe/y1 PEK2 #0010 ADD2
396
-		.Audio0/adsr .track/active PEK #10 MUL ADD #01 ADD DEI #04 SFT
395
+	.ctlframe/x1 LDZ2 #0028 ADD2 .ctlframe/y1 LDZ2 #0010 ADD2
396
+		.Audio0/adsr .track/active LDZ #10 MUL ADD #01 ADD DEI #04 SFT
397 397
 		;draw-knob JSR2
398
-	.ctlframe/x1 PEK2 #0038 ADD2 .ctlframe/y1 PEK2 #0010 ADD2
399
-		.Audio0/adsr .track/active PEK #10 MUL ADD #01 ADD DEI #0f AND
398
+	.ctlframe/x1 LDZ2 #0038 ADD2 .ctlframe/y1 LDZ2 #0010 ADD2
399
+		.Audio0/adsr .track/active LDZ #10 MUL ADD #01 ADD DEI #0f AND
400 400
 		;draw-knob JSR2
401 401
 	( vol )
402
-	.ctlframe/x1 PEK2 #0058 ADD2 .ctlframe/y1 PEK2 8+ #22 ;vol_txt ;draw-label JSR2
403
-	.ctlframe/x1 PEK2 #0058 ADD2 .ctlframe/y1 PEK2 #0010 ADD2
404
-		.Audio0/volume .track/active PEK #10 MUL ADD DEI #04 SFT
402
+	.ctlframe/x1 LDZ2 #0058 ADD2 .ctlframe/y1 LDZ2 8+ #22 ;vol_txt ;draw-label JSR2
403
+	.ctlframe/x1 LDZ2 #0058 ADD2 .ctlframe/y1 LDZ2 #0010 ADD2
404
+		.Audio0/volume .track/active LDZ #10 MUL ADD DEI #04 SFT
405 405
 	;draw-knob/force JSR2
406
-	.ctlframe/x1 PEK2 #0068 ADD2 .ctlframe/y1 PEK2 #0010 ADD2
407
-		.Audio0/volume .track/active PEK #10 MUL ADD DEI #0f AND
406
+	.ctlframe/x1 LDZ2 #0068 ADD2 .ctlframe/y1 LDZ2 #0010 ADD2
407
+		.Audio0/volume .track/active LDZ #10 MUL ADD DEI #0f AND
408 408
 	;draw-knob/force JSR2
409 409
 
410 410
 RTN
411 411
 
412 412
 @draw-vu ( -- )
413
-	.ctlframe/x1 PEK2 #0088 ADD2 .ctlframe/y1 PEK2 #0010 ADD2
414
-		.Audio0/output .track/active PEK #10 MUL ADD DEI DUP STH #04 SFT
413
+	.ctlframe/x1 LDZ2 #0088 ADD2 .ctlframe/y1 LDZ2 #0010 ADD2
414
+		.Audio0/output .track/active LDZ #10 MUL ADD DEI DUP STH #04 SFT
415 415
 	;draw-knob/force JSR2
416
-	.ctlframe/x1 PEK2 #0098 ADD2 .ctlframe/y1 PEK2 #0010 ADD2
416
+	.ctlframe/x1 LDZ2 #0098 ADD2 .ctlframe/y1 LDZ2 #0010 ADD2
417 417
 		STHr #0f AND
418 418
 	;draw-knob/force JSR2
419 419
 
... ...
@@ -421,11 +421,11 @@ RTN
421 421
 
422 422
 @draw-channels
423 423
 	
424
-	.chnframe/x1 PEK2 .chnframe/y1 PEK2 .chnframe/x2 PEK2 .chnframe/y2 PEK2 #01 ;line-rect JSR2
425
-	.chnframe/x1 PEK2 8+ .chnframe/y1 PEK2 8+ #21 .track/active PEK #00 EQU #07 MUL ADD ;ch1_txt ;draw-label JSR2
426
-	.chnframe/x1 PEK2 8+ .chnframe/y1 PEK2 #0010 ADD2 #21 .track/active PEK #01 EQU #07 MUL ADD ;ch2_txt ;draw-label JSR2
427
-	.chnframe/x1 PEK2 8+ .chnframe/y1 PEK2 #0018 ADD2 #21 .track/active PEK #02 EQU #07 MUL ADD ;ch3_txt ;draw-label JSR2
428
-	.chnframe/x1 PEK2 8+ .chnframe/y1 PEK2 #0020 ADD2 #21 .track/active PEK #03 EQU #07 MUL ADD ;ch4_txt ;draw-label JSR2
424
+	.chnframe/x1 LDZ2 .chnframe/y1 LDZ2 .chnframe/x2 LDZ2 .chnframe/y2 LDZ2 #01 ;line-rect JSR2
425
+	.chnframe/x1 LDZ2 8+ .chnframe/y1 LDZ2 8+ #21 .track/active LDZ #00 EQU #07 MUL ADD ;ch1_txt ;draw-label JSR2
426
+	.chnframe/x1 LDZ2 8+ .chnframe/y1 LDZ2 #0010 ADD2 #21 .track/active LDZ #01 EQU #07 MUL ADD ;ch2_txt ;draw-label JSR2
427
+	.chnframe/x1 LDZ2 8+ .chnframe/y1 LDZ2 #0018 ADD2 #21 .track/active LDZ #02 EQU #07 MUL ADD ;ch3_txt ;draw-label JSR2
428
+	.chnframe/x1 LDZ2 8+ .chnframe/y1 LDZ2 #0020 ADD2 #21 .track/active LDZ #03 EQU #07 MUL ADD ;ch4_txt ;draw-label JSR2
429 429
 
430 430
 RTN
431 431
 
... ...
@@ -433,15 +433,15 @@ RTN
433 433
 
434 434
 	( clear last cursor )
435 435
 	;clear_icn .Screen/addr DEO2
436
-	.pointer/x PEK2 .Screen/x DEO2
437
-	.pointer/y PEK2 .Screen/y DEO2
436
+	.pointer/x LDZ2 .Screen/x DEO2
437
+	.pointer/y LDZ2 .Screen/y DEO2
438 438
 	#30 .Screen/color DEO
439 439
 	( record pointer positions )
440
-	.Mouse/x DEI2 .pointer/x POK2 .Mouse/y DEI2 .pointer/y POK2
440
+	.Mouse/x DEI2 .pointer/x STZ2 .Mouse/y DEI2 .pointer/y STZ2
441 441
 	( draw new cursor )
442 442
 	;cursor_icn .Screen/addr DEO2
443
-	.pointer/x PEK2 .Screen/x DEO2
444
-	.pointer/y PEK2 .Screen/y DEO2
443
+	.pointer/x LDZ2 .Screen/x DEO2
444
+	.pointer/y LDZ2 .Screen/y DEO2
445 445
 	#32 .Mouse/state DEI #00 NEQ ADD .Screen/color DEO
446 446
 
447 447
 RTN
... ...
@@ -450,10 +450,10 @@ RTN
450 450
 
451 451
 @draw-label ( x y color addr -- )
452 452
 	
453
-	( load ) .label/addr POK2 .label/color POK .Screen/y DEO2 .Screen/x DEO2
454
-	.label/addr PEK2
453
+	( load ) .label/addr STZ2 .label/color STZ .Screen/y DEO2 .Screen/x DEO2
454
+	.label/addr LDZ2
455 455
 	&loop
456
-		( draw ) DUP2 LDA #00 SWP 8* ;font ADD2 .Screen/addr DEO2 .label/color PEK .Screen/color DEO
456
+		( draw ) DUP2 LDA #00 SWP 8* ;font ADD2 .Screen/addr DEO2 .label/color LDZ .Screen/color DEO
457 457
 		( incr ) ++
458 458
 		( incr ) .Screen/x DEI2 8+ .Screen/x DEO2
459 459
 		DUP2 LDA #00 NEQ ,&loop JCN
... ...
@@ -463,9 +463,9 @@ RTN
463 463
 
464 464
 @line-vertical-dotted ( x y0 y1 color -- )
465 465
 	
466
-	.color POK STH2 SWP2 .Screen/x DEO2 STH2r OVR2 .Screen/y DEO2
466
+	.color STZ STH2 SWP2 .Screen/x DEO2 STH2r OVR2 .Screen/y DEO2
467 467
 	&draw-ver
468
-		( draw ) .color PEK .Screen/color DEO
468
+		( draw ) .color LDZ .Screen/color DEO
469 469
 		( incr ) SWP2 #0002 ADD2 DUP2 .Screen/y DEO2 SWP2
470 470
 		OVR2 OVR2 LTH2 ,&draw-ver JCN
471 471
 	POP2 POP2
... ...
@@ -474,9 +474,9 @@ RTN
474 474
 
475 475
 @line-horizontal-dotted ( x0 x1 y color -- )
476 476
 	
477
-	.color POK .Screen/y DEO2 OVR2 .Screen/x DEO2
477
+	.color STZ .Screen/y DEO2 OVR2 .Screen/x DEO2
478 478
 	&draw-hor
479
-		( draw ) .color PEK .Screen/color DEO
479
+		( draw ) .color LDZ .Screen/color DEO
480 480
 		( incr ) SWP2 #0002 ADD2 DUP2 .Screen/x DEO2 SWP2
481 481
 		OVR2 OVR2 LTH2 ,&draw-hor JCN
482 482
 	POP2 POP2
... ...
@@ -485,18 +485,18 @@ RTN
485 485
 
486 486
 @line-rect ( x1 y1 x2 y2 color )
487 487
 
488
-	( load ) .color POK .rect/y2 POK2 .rect/x2 POK2 DUP2 .Screen/y DEO2 .rect/y1 POK2 DUP2 .Screen/x DEO2 .rect/x1 POK2
488
+	( load ) .color STZ .rect/y2 STZ2 .rect/x2 STZ2 DUP2 .Screen/y DEO2 .rect/y1 STZ2 DUP2 .Screen/x DEO2 .rect/x1 STZ2
489 489
 	&hor
490 490
 		( incr ) .Screen/x DEI2 ++ .Screen/x DEO2
491
-		( draw ) .rect/y1 PEK2 .Screen/y DEO2 .color PEK .Screen/color DEO
492
-		( draw ) .rect/y2 PEK2 .Screen/y DEO2 .color PEK .Screen/color DEO
493
-		.Screen/x DEI2 .rect/x2 PEK2 LTH2 ,&hor JCN
494
-	.rect/y1 PEK2 .Screen/y DEO2
491
+		( draw ) .rect/y1 LDZ2 .Screen/y DEO2 .color LDZ .Screen/color DEO
492
+		( draw ) .rect/y2 LDZ2 .Screen/y DEO2 .color LDZ .Screen/color DEO
493
+		.Screen/x DEI2 .rect/x2 LDZ2 LTH2 ,&hor JCN
494
+	.rect/y1 LDZ2 .Screen/y DEO2
495 495
 	&ver
496
-		( draw ) .rect/x1 PEK2 .Screen/x DEO2 .color PEK .Screen/color DEO
497
-		( draw ) .rect/x2 PEK2 .Screen/x DEO2 .color PEK .Screen/color DEO
496
+		( draw ) .rect/x1 LDZ2 .Screen/x DEO2 .color LDZ .Screen/color DEO
497
+		( draw ) .rect/x2 LDZ2 .Screen/x DEO2 .color LDZ .Screen/color DEO
498 498
 		( incr ) .Screen/y DEI2 ++ .Screen/y DEO2
499
-		.Screen/y DEI2 .rect/y2 PEK2 ++ LTH2 ,&ver JCN
499
+		.Screen/y DEI2 .rect/y2 LDZ2 ++ LTH2 ,&ver JCN
500 500
 
501 501
 RTN
502 502
 
... ...
@@ -61,29 +61,29 @@
61 61
 	;saw-path   .File/name DEO2 #0100 .File/length DEO2 WAVEFORM #0500 ++ .File/load DEO2
62 62
 
63 63
 	( find center )
64
-	.Screen/width DEI2 #0002 // .center/x POK2
65
-	.Screen/height DEI2 #0002 // .center/y POK2
64
+	.Screen/width DEI2 #0002 // .center/x STZ2
65
+	.Screen/height DEI2 #0002 // .center/y STZ2
66 66
 
67 67
 	( place octave )
68
-	.center/x PEK2 #0080 -- .octave-view/x1 POK2
69
-	.center/y PEK2 #0008 ++ .octave-view/y1 POK2
70
-	.octave-view/x1 PEK2 #0050 ++ .octave-view/x2 POK2
71
-	.octave-view/y1 PEK2 #0018 ++ .octave-view/y2 POK2
68
+	.center/x LDZ2 #0080 -- .octave-view/x1 STZ2
69
+	.center/y LDZ2 #0008 ++ .octave-view/y1 STZ2
70
+	.octave-view/x1 LDZ2 #0050 ++ .octave-view/x2 STZ2
71
+	.octave-view/y1 LDZ2 #0018 ++ .octave-view/y2 STZ2
72 72
 
73 73
 	( place adsr )
74
-	.center/x PEK2 #0020 -- .adsr-view/x1 POK2
75
-	.center/y PEK2 #0008 ++ .adsr-view/y1 POK2
76
-	.adsr-view/x1 PEK2 #00a0 ++ .adsr-view/x2 POK2
77
-	.adsr-view/y1 PEK2 #0018 ++ .adsr-view/y2 POK2
74
+	.center/x LDZ2 #0020 -- .adsr-view/x1 STZ2
75
+	.center/y LDZ2 #0008 ++ .adsr-view/y1 STZ2
76
+	.adsr-view/x1 LDZ2 #00a0 ++ .adsr-view/x2 STZ2
77
+	.adsr-view/y1 LDZ2 #0018 ++ .adsr-view/y2 STZ2
78 78
 
79 79
 	( place waveform )
80
-	.center/x PEK2 #0080 -- .wave-view/x1 POK2
81
-	.center/y PEK2 #0020 -- .wave-view/y1 POK2
82
-	.wave-view/x1 PEK2 #0100 ++ .wave-view/x2 POK2
83
-	.wave-view/y1 PEK2 #0020 ++ .wave-view/y2 POK2
80
+	.center/x LDZ2 #0080 -- .wave-view/x1 STZ2
81
+	.center/y LDZ2 #0020 -- .wave-view/y1 STZ2
82
+	.wave-view/x1 LDZ2 #0100 ++ .wave-view/x2 STZ2
83
+	.wave-view/y1 LDZ2 #0020 ++ .wave-view/y2 STZ2
84 84
 
85 85
 	( default settings )
86
-	#ff .last-note POK
86
+	#ff .last-note STZ
87 87
 	#041c .Audio0/adsr DEO2
88 88
 	#88 .Audio0/volume DEO
89 89
 	WAVEFORM .Audio0/addr DEO2
... ...
@@ -98,13 +98,13 @@ BRK
98 98
 
99 99
 @on-frame ( -> )
100 100
 	
101
-	.adsr-view/y2 PEK2 #0020 -- .Screen/y DEO2
101
+	.adsr-view/y2 LDZ2 #0020 -- .Screen/y DEO2
102 102
 
103 103
 	#00 #10
104 104
 	&loop
105
-		.adsr-view/x2 PEK2 #003a -- .Screen/x DEO2
105
+		.adsr-view/x2 LDZ2 #003a -- .Screen/x DEO2
106 106
 		OVR #10 SWP - .Audio0/output DEI #0f AND < .Screen/color DEO
107
-		.adsr-view/x2 PEK2 #003a -- #0002 ++ .Screen/x DEO2
107
+		.adsr-view/x2 LDZ2 #003a -- #0002 ++ .Screen/x DEO2
108 108
 		OVR #10 SWP - .Audio0/output DEI #04 SFT < .Screen/color DEO
109 109
 		.Screen/y DEI2 #0002 ++ .Screen/y DEO2
110 110
 		( incr ) SWP #01 + SWP
... ...
@@ -125,23 +125,23 @@ BRK
125 125
 	;draw-cursor JSR2 
126 126
 	.Mouse/state DEI #00 ! #01 JCN [ BRK ]
127 127
 	( wave-view )
128
-	.Mouse/x DEI2 DUP2 .wave-view/x1 PEK2 >> ROT ROT .wave-view/x2 PEK2 #0001 ++ << #0101 ==
129
-	.Mouse/y DEI2 DUP2 .wave-view/y1 PEK2 >> ROT ROT .wave-view/y2 PEK2 << #0101 ==
128
+	.Mouse/x DEI2 DUP2 .wave-view/x1 LDZ2 >> ROT ROT .wave-view/x2 LDZ2 #0001 ++ << #0101 ==
129
+	.Mouse/y DEI2 DUP2 .wave-view/y1 LDZ2 >> ROT ROT .wave-view/y2 LDZ2 << #0101 ==
130 130
 	#0101 == ;on-touch-wave-view JCN2
131 131
 	( adsr-view )
132
-	.Mouse/x DEI2 DUP2 .adsr-view/x1 PEK2 >> ROT ROT .adsr-view/x2 PEK2 << #0101 ==
133
-	.Mouse/y DEI2 DUP2 .adsr-view/y1 PEK2 >> ROT ROT .adsr-view/y2 PEK2 << #0101 ==
132
+	.Mouse/x DEI2 DUP2 .adsr-view/x1 LDZ2 >> ROT ROT .adsr-view/x2 LDZ2 << #0101 ==
133
+	.Mouse/y DEI2 DUP2 .adsr-view/y1 LDZ2 >> ROT ROT .adsr-view/y2 LDZ2 << #0101 ==
134 134
 	#0101 == ;on-touch-adsr-view JCN2
135 135
 	( octave-view )
136
-	.Mouse/x DEI2 DUP2 .octave-view/x1 PEK2 >> ROT ROT .octave-view/x2 PEK2 << #0101 ==
137
-	.Mouse/y DEI2 DUP2 .octave-view/y1 PEK2 >> ROT ROT .octave-view/y2 PEK2 << #0101 ==
136
+	.Mouse/x DEI2 DUP2 .octave-view/x1 LDZ2 >> ROT ROT .octave-view/x2 LDZ2 << #0101 ==
137
+	.Mouse/y DEI2 DUP2 .octave-view/y1 LDZ2 >> ROT ROT .octave-view/y2 LDZ2 << #0101 ==
138 138
 	#0101 == ;on-touch-octave-view JCN2
139 139
 
140 140
 BRK
141 141
 
142 142
 @on-touch-wave-view ( -> )
143 143
 
144
-	.Mouse/x DEI2 .wave-view/x1 PEK2 -- .Audio0/length DEO2
144
+	.Mouse/x DEI2 .wave-view/x1 LDZ2 -- .Audio0/length DEO2
145 145
 	;draw-wave JSR2
146 146
 	;draw-cursor JSR2 
147 147
 
... ...
@@ -149,20 +149,20 @@ BRK
149 149
 
150 150
 @on-touch-octave-view ( -> )
151 151
 
152
-	.Mouse/x DEI2 .octave-view/x1 PEK2 -- #0008 // SWP POP #09 ! ,&no-mod JCN
153
-		.Mouse/y DEI2 .octave-view/y1 PEK2 -- #0008 // SWP POP 
152
+	.Mouse/x DEI2 .octave-view/x1 LDZ2 -- #0008 // SWP POP #09 ! ,&no-mod JCN
153
+		.Mouse/y DEI2 .octave-view/y1 LDZ2 -- #0008 // SWP POP 
154 154
 		DUP #00 ! ,&no-incr JCN
155
-			.octave PEK #01 + .octave POK &no-incr
155
+			.octave LDZ #01 + .octave STZ &no-incr
156 156
 		DUP #02 ! ,&no-decr JCN
157
-			.octave PEK #01 - .octave POK &no-decr
157
+			.octave LDZ #01 - .octave STZ &no-decr
158 158
 		POP
159 159
 		( release ) #00 .Mouse/state DEO
160 160
 		;draw-octave JSR2
161 161
 		BRK
162 162
 	&no-mod
163 163
 
164
-	.Mouse/x DEI2 .octave-view/x1 PEK2 -- #0008 // SWP POP #06 > ,&no-key JCN
165
-		.Mouse/x DEI2 .octave-view/x1 PEK2 -- #0008 // DUP2 SWP POP .last-note POK ;notes ++ LDA ;play JSR2
164
+	.Mouse/x DEI2 .octave-view/x1 LDZ2 -- #0008 // SWP POP #06 > ,&no-key JCN
165
+		.Mouse/x DEI2 .octave-view/x1 LDZ2 -- #0008 // DUP2 SWP POP .last-note STZ ;notes ++ LDA ;play JSR2
166 166
 		( release ) #00 .Mouse/state DEO
167 167
 		;draw-octave JSR2
168 168
 	&no-key
... ...
@@ -171,7 +171,7 @@ BRK
171 171
 
172 172
 @on-touch-adsr-view ( -> )
173 173
 
174
-	.Mouse/x DEI2 .adsr-view/x1 PEK2 -- #0008 // SWP POP #03 /
174
+	.Mouse/x DEI2 .adsr-view/x1 LDZ2 -- #0008 // SWP POP #03 /
175 175
 	DUP #00 ! ,&no-a JCN
176 176
 		.Audio0/adsr DEI
177 177
 		#10 .Mouse/state DEI #10 = #e0 * + +
... ...
@@ -208,27 +208,27 @@ BRK
208 208
 
209 209
 	( clear last cursor )
210 210
 	#fff8 .Screen/addr DEO2 
211
-	.pointer/x PEK2 .Screen/x DEO2 
212
-	.pointer/y PEK2 .Screen/y DEO2 
211
+	.pointer/x LDZ2 .Screen/x DEO2 
212
+	.pointer/y LDZ2 .Screen/y DEO2 
213 213
 	#30 .Screen/color DEO
214 214
 
215 215
 	.Controller/key DEI
216 216
 	DUP #61 ! ,&no-c JCN
217
-		#00 .last-note POK ;notes LDA ;play JSR2 &no-c
217
+		#00 .last-note STZ ;notes LDA ;play JSR2 &no-c
218 218
 	DUP #73 ! ,&no-d JCN
219
-		#01 .last-note POK ;notes #0001 ++ LDA ;play JSR2 &no-d
219
+		#01 .last-note STZ ;notes #0001 ++ LDA ;play JSR2 &no-d
220 220
 	DUP #64 ! ,&no-e JCN
221
-		#02 .last-note POK ;notes #0002 ++ LDA ;play JSR2 &no-e
221
+		#02 .last-note STZ ;notes #0002 ++ LDA ;play JSR2 &no-e
222 222
 	DUP #66 ! ,&no-f JCN
223
-		#03 .last-note POK ;notes #0003 ++ LDA ;play JSR2 &no-f
223
+		#03 .last-note STZ ;notes #0003 ++ LDA ;play JSR2 &no-f
224 224
 	DUP #67 ! ,&no-g JCN
225
-		#04 .last-note POK ;notes #0004 ++ LDA ;play JSR2 &no-g
225
+		#04 .last-note STZ ;notes #0004 ++ LDA ;play JSR2 &no-g
226 226
 	DUP #68 ! ,&no-a JCN
227
-		#05 .last-note POK ;notes #0005 ++ LDA ;play JSR2 &no-a
227
+		#05 .last-note STZ ;notes #0005 ++ LDA ;play JSR2 &no-a
228 228
 	DUP #6a ! ,&no-b JCN
229
-		#06 .last-note POK ;notes #0006 ++ LDA ;play JSR2 &no-b
229
+		#06 .last-note STZ ;notes #0006 ++ LDA ;play JSR2 &no-b
230 230
 	DUP #6b ! ,&no-c2 JCN
231
-		#07 .last-note POK ;notes #0007 ++ LDA ;play JSR2 &no-c2
231
+		#07 .last-note STZ ;notes #0007 ++ LDA ;play JSR2 &no-c2
232 232
 	POP
233 233
 
234 234
 	.Controller/button DEI #f0 AND
... ...
@@ -249,7 +249,7 @@ BRK
249 249
 
250 250
 @play ( pitch -- )
251 251
 	
252
-	DUP .octave PEK #0c * + .Audio0/pitch DEO
252
+	DUP .octave LDZ #0c * + .Audio0/pitch DEO
253 253
 
254 254
 RTN
255 255
 
... ...
@@ -257,15 +257,15 @@ RTN
257 257
 	
258 258
 	( clear last cursor )
259 259
 	;cursor .Screen/addr DEO2 
260
-	.pointer/x PEK2 .Screen/x DEO2 
261
-	.pointer/y PEK2 .Screen/y DEO2 
260
+	.pointer/x LDZ2 .Screen/x DEO2 
261
+	.pointer/y LDZ2 .Screen/y DEO2 
262 262
 	#30 .Screen/color DEO
263 263
 	( record pointer positions )
264
-	.Mouse/x DEI2 .pointer/x POK2 
265
-	.Mouse/y DEI2 .pointer/y POK2
264
+	.Mouse/x DEI2 .pointer/x STZ2 
265
+	.Mouse/y DEI2 .pointer/y STZ2
266 266
 	( draw new cursor )
267
-	.pointer/x PEK2 .Screen/x DEO2 
268
-	.pointer/y PEK2 .Screen/y DEO2 
267
+	.pointer/x LDZ2 .Screen/x DEO2 
268
+	.pointer/y LDZ2 .Screen/y DEO2 
269 269
 	( colorize on state )
270 270
 	#31 [ .Mouse/state DEI #00 ! ] + .Screen/color DEO
271 271
 
... ...
@@ -273,28 +273,28 @@ RTN
273 273
 
274 274
 @draw-octave ( -- )
275 275
 	
276
-	.octave-view/x1 PEK2 .octave-view/y1 PEK2
276
+	.octave-view/x1 LDZ2 .octave-view/y1 LDZ2
277 277
 
278
-	OVR2 OVR2 ;keys-left-icns #21 .last-note PEK #00 = + ;draw-key JSR2
279
-	OVR2 #0008 ++ OVR2 ;keys-middle-icns #21 .last-note PEK #01 = + ;draw-key JSR2
280
-	OVR2 #0010 ++ OVR2 ;keys-right-icns #21 .last-note PEK #02 = + ;draw-key JSR2
281
-	OVR2 #0018 ++ OVR2 ;keys-left-icns #21 .last-note PEK #03 = + ;draw-key JSR2
282
-	OVR2 #0020 ++ OVR2 ;keys-middle-icns #21 .last-note PEK #04 = + ;draw-key JSR2
283
-	OVR2 #0028 ++ OVR2 ;keys-middle-icns #21 .last-note PEK #05 = + ;draw-key JSR2
284
-	SWP2 #0030 ++ SWP2 ;keys-right-icns #21 .last-note PEK #06 = + ;draw-key JSR2
278
+	OVR2 OVR2 ;keys-left-icns #21 .last-note LDZ #00 = + ;draw-key JSR2
279
+	OVR2 #0008 ++ OVR2 ;keys-middle-icns #21 .last-note LDZ #01 = + ;draw-key JSR2
280
+	OVR2 #0010 ++ OVR2 ;keys-right-icns #21 .last-note LDZ #02 = + ;draw-key JSR2
281
+	OVR2 #0018 ++ OVR2 ;keys-left-icns #21 .last-note LDZ #03 = + ;draw-key JSR2
282
+	OVR2 #0020 ++ OVR2 ;keys-middle-icns #21 .last-note LDZ #04 = + ;draw-key JSR2
283
+	OVR2 #0028 ++ OVR2 ;keys-middle-icns #21 .last-note LDZ #05 = + ;draw-key JSR2
284
+	SWP2 #0030 ++ SWP2 ;keys-right-icns #21 .last-note LDZ #06 = + ;draw-key JSR2
285 285
 
286
-	.octave-view/x1 PEK2 #0048 ++ .Screen/x DEO2
286
+	.octave-view/x1 LDZ2 #0048 ++ .Screen/x DEO2
287 287
 
288 288
 	;arrow-icns .Screen/addr DEO2
289
-	.octave-view/y1 PEK2 .Screen/y DEO2
289
+	.octave-view/y1 LDZ2 .Screen/y DEO2
290 290
 	#21 .Screen/color DEO
291 291
 
292 292
 	;arrow-icns #0008 ++ .Screen/addr DEO2
293
-	.octave-view/y1 PEK2 #0010 ++ .Screen/y DEO2
293
+	.octave-view/y1 LDZ2 #0010 ++ .Screen/y DEO2
294 294
 	#21 .Screen/color DEO
295 295
 
296
-	;font-hex .octave PEK #03 + #00 SWP #0008 ** ++ .Screen/addr DEO2
297
-	.octave-view/y1 PEK2 #0008 ++ .Screen/y DEO2
296
+	;font-hex .octave LDZ #03 + #00 SWP #0008 ** ++ .Screen/addr DEO2
297
+	.octave-view/y1 LDZ2 #0008 ++ .Screen/y DEO2
298 298
 	#23 .Screen/color DEO
299 299
 
300 300
 RTN
... ...
@@ -319,23 +319,23 @@ RTN
319 319
 @draw-adsr ( -- )
320 320
 	
321 321
 	( adsr )
322
-	.adsr-view/x1 PEK2 .adsr-view/y1 PEK2
322
+	.adsr-view/x1 LDZ2 .adsr-view/y1 LDZ2
323 323
 		.Audio0/adsr DEI #04 SFT
324 324
 		;draw-knob JSR2
325
-	.adsr-view/x1 PEK2 #0018 ++ .adsr-view/y1 PEK2
325
+	.adsr-view/x1 LDZ2 #0018 ++ .adsr-view/y1 LDZ2
326 326
 		.Audio0/adsr DEI #0f AND
327 327
 		;draw-knob JSR2
328
-	.adsr-view/x1 PEK2 #0030 ++ .adsr-view/y1 PEK2
328
+	.adsr-view/x1 LDZ2 #0030 ++ .adsr-view/y1 LDZ2
329 329
 		.Audio0/adsr #01 + DEI #04 SFT
330 330
 		;draw-knob JSR2
331
-	.adsr-view/x1 PEK2 #0048 ++ .adsr-view/y1 PEK2
331
+	.adsr-view/x1 LDZ2 #0048 ++ .adsr-view/y1 LDZ2
332 332
 		.Audio0/adsr #01 + DEI #0f AND
333 333
 		;draw-knob JSR2
334 334
 	( volume )
335
-	.adsr-view/x2 PEK2 #0028 -- .adsr-view/y1 PEK2
335
+	.adsr-view/x2 LDZ2 #0028 -- .adsr-view/y1 LDZ2
336 336
 		.Audio0/volume DEI #04 SFT
337 337
 		;draw-knob JSR2
338
-	.adsr-view/x2 PEK2 #0010 -- .adsr-view/y1 PEK2
338
+	.adsr-view/x2 LDZ2 #0010 -- .adsr-view/y1 LDZ2
339 339
 		.Audio0/volume DEI #0f AND
340 340
 		;draw-knob JSR2
341 341
 
... ...
@@ -344,27 +344,27 @@ RTN
344 344
 @draw-wave ( -- )
345 345
 	
346 346
 	( clear )
347
-	.wave-view/x1 PEK2
348
-	.wave-view/y1 PEK2
349
-	.wave-view/x2 PEK2 #0001 ++
350
-	.wave-view/y2 PEK2
347
+	.wave-view/x1 LDZ2
348
+	.wave-view/y1 LDZ2
349
+	.wave-view/x2 LDZ2 #0001 ++
350
+	.wave-view/y2 LDZ2
351 351
 	#00 ;fill-rect JSR2
352 352
 
353 353
 	#01 ;draw-wave-length JSR2
354 354
 
355
-	.wave-view/x1 PEK2 .Screen/x DEO2
355
+	.wave-view/x1 LDZ2 .Screen/x DEO2
356 356
 
357 357
 	( waveform )
358 358
 	#00 #ff
359 359
 	&loop
360 360
 		( dotted line )
361 361
 		OVR #01 AND ,&no-dot JCN 
362
-			.wave-view/y1 PEK2 #0010 ++ .Screen/y DEO2
362
+			.wave-view/y1 LDZ2 #0010 ++ .Screen/y DEO2
363 363
 			#03 .Screen/color DEO
364 364
 		&no-dot
365 365
 		OVR TOS .Audio0/addr DEI2 ++ LDA 
366 366
 		#02 /
367
-		TOS #0004 // .wave-view/y1 PEK2 ++ .Screen/y DEO2
367
+		TOS #0004 // .wave-view/y1 LDZ2 ++ .Screen/y DEO2
368 368
 		.Screen/x DEI2 #0001 ++ .Screen/x DEO2
369 369
 		( draw ) OVR .Audio0/length DEI2 SWP POP > #02 * #01 + .Screen/color DEO
370 370
 		( incr ) SWP #01 + SWP
... ...
@@ -372,10 +372,10 @@ RTN
372 372
 	POP2
373 373
 
374 374
 	( range )
375
-	.wave-view/x1 PEK2 .Screen/x DEO2
376
-	.wave-view/y1 PEK2 #0010 -- .Screen/y DEO2
375
+	.wave-view/x1 LDZ2 .Screen/x DEO2
376
+	.wave-view/y1 LDZ2 #0010 -- .Screen/y DEO2
377 377
 	.Audio0/addr DEI2 #22 ;draw-short JSR2
378
-	.wave-view/x2 PEK2 #0020 -- .Screen/x DEO2
378
+	.wave-view/x2 LDZ2 #0020 -- .Screen/x DEO2
379 379
 	.Audio0/length DEI2 #22 ;draw-short JSR2
380 380
 
381 381
 RTN
... ...
@@ -383,8 +383,8 @@ RTN
383 383
 @draw-wave-length ( color -- )
384 384
 	
385 385
 	STH
386
-	.wave-view/x1 PEK2 .Audio0/length DEI2 ++ .Screen/x DEO2
387
-	.wave-view/y1 PEK2 DUP2 #0020 ++
386
+	.wave-view/x1 LDZ2 .Audio0/length DEI2 ++ .Screen/x DEO2
387
+	.wave-view/y1 LDZ2 DUP2 #0020 ++
388 388
 	&loop
389 389
 		OVR2 .Screen/y DEO2
390 390
 		( draw ) DUPr STHr .Screen/color DEO
... ...
@@ -439,14 +439,14 @@ RTN
439 439
 
440 440
 @fill-rect ( x1* y1* x2* y2* color -- )
441 441
 	
442
-	.color POK
442
+	.color STZ
443 443
 	( x1 x2 y1 y2 ) ROT2 SWP2
444 444
 	&ver
445 445
 		( save ) OVR2 .Screen/y DEO2
446 446
 		STH2 STH2 OVR2 OVR2
447 447
 		&hor
448 448
 			( save ) OVR2 .Screen/x DEO2
449
-			( draw ) .color PEK .Screen/color DEO
449
+			( draw ) .color LDZ .Screen/color DEO
450 450
 			( incr ) SWP2 #0001 ++ SWP2
451 451
 			OVR2 OVR2 LTS2 ,&hor JCN
452 452
 		POP2 POP2 STH2r STH2r
... ...
@@ -28,8 +28,8 @@
28 28
 	#0caf .System/b DEO2
29 29
 
30 30
 	( find center )
31
-	.Screen/width DEI2 #0002 / #0008 - .cat/x POK2
32
-	.Screen/height DEI2 #0004 / #0003 * #0018 - .cat/y POK2
31
+	.Screen/width DEI2 #0002 / #0008 - .cat/x STZ2
32
+	.Screen/height DEI2 #0004 / #0003 * #0018 - .cat/y STZ2
33 33
 
34 34
 	( vectors )
35 35
 	;on-mouse .Mouse/vector DEO2
... ...
@@ -44,15 +44,15 @@ BRK
44 44
 	
45 45
 	;draw-cursor JSR2
46 46
 
47
-	.Mouse/x DEI2 .cat/x PEK2 > #20 MUL
48
-	.Mouse/y DEI2 .cat/y PEK2 > #40 MUL
47
+	.Mouse/x DEI2 .cat/x LDZ2 > #20 MUL
48
+	.Mouse/y DEI2 .cat/y LDZ2 > #40 MUL
49 49
 		ADD #00 SWP ;draw-eye JSR2
50 50
 
51 51
 BRK
52 52
 
53 53
 @on-frame ( -> )
54 54
 
55
-	.cat/timer PEK #01 ADD [ DUP ] .cat/timer POK
55
+	.cat/timer LDZ #01 ADD [ DUP ] .cat/timer STZ
56 56
 		DUP #00 NEQ ,&skip0 JCN #0000 ;draw-tail JSR2 &skip0
57 57
 		DUP #10 NEQ ,&skip1 JCN #0001 ;draw-tail JSR2 &skip1
58 58
 		DUP #20 NEQ ,&skip2 JCN #0002 ;draw-tail JSR2 &skip2
... ...
@@ -66,8 +66,8 @@ BRK
66 66
 @draw-polycat ( -- )
67 67
 
68 68
 	( ears )
69
-	.cat/y PEK2 .Screen/y DEO2
70
-	.cat/x PEK2 DUP2 STH2 #0008 - .Screen/x DEO2
69
+	.cat/y LDZ2 .Screen/y DEO2
70
+	.cat/x LDZ2 DUP2 STH2 #0008 - .Screen/x DEO2
71 71
 	;ears .Screen/addr DEO2
72 72
 	#41 .Screen/color DEO
73 73
 	STH2r .Screen/x DEO2
... ...
@@ -81,8 +81,8 @@ RTN
81 81
 
82 82
 @draw-eye ( quad* -- )
83 83
 	
84
-	.cat/y PEK2 #0008 + .Screen/y DEO2
85
-	.cat/x PEK2 DUP2 STH2 #0008 - .Screen/x DEO2
84
+	.cat/y LDZ2 #0008 + .Screen/y DEO2
85
+	.cat/x LDZ2 DUP2 STH2 #0008 - .Screen/x DEO2
86 86
 	DUP2 ;eye + .Screen/addr DEO2
87 87
 	( draw ) #41 .Screen/color DEO
88 88
 	STH2r .Screen/x DEO2
... ...
@@ -93,8 +93,8 @@ RTN
93 93
 
94 94
 @draw-tail ( frame* -- )
95 95
 
96
-	.cat/y PEK2 #0010 + .Screen/y DEO2
97
-	.cat/x PEK2 DUP2 STH2 #0008 - .Screen/x DEO2
96
+	.cat/y LDZ2 #0010 + .Screen/y DEO2
97
+	.cat/x LDZ2 DUP2 STH2 #0008 - .Screen/x DEO2
98 98
 	;body .Screen/addr DEO2
99 99
 	( draw ) #41 .Screen/color DEO
100 100
 	STH2r .Screen/x DEO2
... ...
@@ -107,17 +107,17 @@ RTN
107 107
 	
108 108
 	( clear last cursor )
109 109
 	;cursor .Screen/addr DEO2 
110
-	.pointer/x PEK2 .Screen/x DEO2 
111
-	.pointer/y PEK2 .Screen/y DEO2 
110
+	.pointer/x LDZ2 .Screen/x DEO2 
111
+	.pointer/y LDZ2 .Screen/y DEO2 
112 112
 	#30 .Screen/color DEO
113 113
 
114 114
 	( record pointer positions )
115
-	.Mouse/x DEI2 .pointer/x POK2 
116
-	.Mouse/y DEI2 .pointer/y POK2
115
+	.Mouse/x DEI2 .pointer/x STZ2 
116
+	.Mouse/y DEI2 .pointer/y STZ2
117 117
 
118 118
 	( draw new cursor )
119
-	.pointer/x PEK2 .Screen/x DEO2 
120
-	.pointer/y PEK2 .Screen/y DEO2 
119
+	.pointer/x LDZ2 .Screen/x DEO2 
120
+	.pointer/y LDZ2 .Screen/y DEO2 
121 121
 
122 122
 	( colorize on state )
123 123
 	#31 [ .Mouse/state DEI #00 NEQ ] ADD .Screen/color DEO
... ...
@@ -126,8 +126,8 @@ RTN
126 126
 
127 127
 @draw-ground ( -- )
128 128
 
129
-	.cat/y PEK2 #0018 + .Screen/y DEO2
130
-	.cat/x PEK2 #0010 - .Screen/x DEO2
129
+	.cat/y LDZ2 #0018 + .Screen/y DEO2
130
+	.cat/x LDZ2 #0010 - .Screen/x DEO2
131 131
 	;ground .Screen/addr DEO2
132 132
 
133 133
 	#00 #10
... ...
@@ -44,21 +44,21 @@
44 44
 	;on-mouse .Mouse/vector DEO2
45 45
 	
46 46
 	( size window )
47
-	#00b0 .window/w POK2
48
-	#0050 .window/h POK2
47
+	#00b0 .window/w STZ2
48
+	#0050 .window/h STZ2
49 49
 
50 50
 	( center window )
51
-	.Screen/width DEI2 2/ .window/w PEK2 2/ SUB2 .window/x1 POK2
52
-	.Screen/height DEI2 2/ .window/h PEK2 2/ SUB2 .window/y1 POK2
51
+	.Screen/width DEI2 2/ .window/w LDZ2 2/ SUB2 .window/x1 STZ2
52
+	.Screen/height DEI2 2/ .window/h LDZ2 2/ SUB2 .window/y1 STZ2
53 53
 
54
-	#01 .theme/r1 POK #02 .theme/g1 POK #03 .theme/b1 POK
55
-	#04 .theme/r2 POK #06 .theme/g2 POK #07 .theme/b2 POK
56
-	#0a .theme/r3 POK #09 .theme/g3 POK #08 .theme/b3 POK
57
-	#0c .theme/r4 POK #0b .theme/g4 POK #0d .theme/b4 POK
54
+	#01 .theme/r1 STZ #02 .theme/g1 STZ #03 .theme/b1 STZ
55
+	#04 .theme/r2 STZ #06 .theme/g2 STZ #07 .theme/b2 STZ
56
+	#0a .theme/r3 STZ #09 .theme/g3 STZ #08 .theme/b3 STZ
57
+	#0c .theme/r4 STZ #0b .theme/g4 STZ #0d .theme/b4 STZ
58 58
 
59 59
 	( find screen center )
60
-	.Screen/width DEI2 2/ .center/x POK2
61
-	.Screen/height DEI2 2/ .center/y POK2
60
+	.Screen/width DEI2 2/ .center/x STZ2
61
+	.Screen/height DEI2 2/ .center/y STZ2
62 62
 
63 63
 	;update-theme JSR2
64 64
 	;draw-background JSR2
... ...
@@ -72,26 +72,26 @@ BRK
72 72
 
73 73
 	.Mouse/state DEI #00 NEQ #01 JCN [ BRK ]
74 74
 
75
-	.Mouse/y DEI2 .window/y1 PEK2 SUB2 STEP8
75
+	.Mouse/y DEI2 .window/y1 LDZ2 SUB2 STEP8
76 76
 	DUP2 #0010 NEQ2 ,&no-touch-red JCN
77
-		.Mouse/x DEI2 .window/x1 PEK2 #0060 ADD2 LTH2 ,&no-touch-red JCN
78
-		.Mouse/x DEI2 .window/x1 PEK2 #009c ADD2 GTH2 ,&no-touch-red JCN
79
-		( get new value ) .Mouse/x DEI2 .window/x1 PEK2 SUB2 #0060 SUB2 #0004 DIV2 SWP POP ;theme/r1 #00 .selection PEK ADD2 STA
77
+		.Mouse/x DEI2 .window/x1 LDZ2 #0060 ADD2 LTH2 ,&no-touch-red JCN
78
+		.Mouse/x DEI2 .window/x1 LDZ2 #009c ADD2 GTH2 ,&no-touch-red JCN
79
+		( get new value ) .Mouse/x DEI2 .window/x1 LDZ2 SUB2 #0060 SUB2 #0004 DIV2 SWP POP ;theme/r1 #00 .selection LDZ ADD2 STA
80 80
 	&no-touch-red
81 81
 	DUP2 #0020 NEQ2 ,&no-touch-green JCN
82
-		.Mouse/x DEI2 .window/x1 PEK2 #0060 ADD2 LTH2 ,&no-touch-green JCN
83
-		.Mouse/x DEI2 .window/x1 PEK2 #009c ADD2 GTH2 ,&no-touch-green JCN
84
-		( get new value ) .Mouse/x DEI2 .window/x1 PEK2 SUB2 #0060 SUB2 #0004 DIV2 SWP POP ;theme/g1 #00 .selection PEK ADD2 STA
82
+		.Mouse/x DEI2 .window/x1 LDZ2 #0060 ADD2 LTH2 ,&no-touch-green JCN
83
+		.Mouse/x DEI2 .window/x1 LDZ2 #009c ADD2 GTH2 ,&no-touch-green JCN
84
+		( get new value ) .Mouse/x DEI2 .window/x1 LDZ2 SUB2 #0060 SUB2 #0004 DIV2 SWP POP ;theme/g1 #00 .selection LDZ ADD2 STA
85 85
 	&no-touch-green
86 86
 	DUP2 #0030 NEQ2 ,&no-touch-blue JCN
87
-		.Mouse/x DEI2 .window/x1 PEK2 #0060 ADD2 LTH2 ,&no-touch-blue JCN
88
-		.Mouse/x DEI2 .window/x1 PEK2 #009c ADD2 GTH2 ,&no-touch-blue JCN
89
-		( get new value ) .Mouse/x DEI2 .window/x1 PEK2 SUB2 #0060 SUB2 #0004 DIV2 SWP POP ;theme/b1 #00 .selection PEK ADD2 STA
87
+		.Mouse/x DEI2 .window/x1 LDZ2 #0060 ADD2 LTH2 ,&no-touch-blue JCN
88
+		.Mouse/x DEI2 .window/x1 LDZ2 #009c ADD2 GTH2 ,&no-touch-blue JCN
89
+		( get new value ) .Mouse/x DEI2 .window/x1 LDZ2 SUB2 #0060 SUB2 #0004 DIV2 SWP POP ;theme/b1 #00 .selection LDZ ADD2 STA
90 90
 	&no-touch-blue
91 91
 	DUP2 #0040 NEQ2 ,&no-touch-radio JCN
92
-		.Mouse/x DEI2 .window/x1 PEK2 #0050 ADD2 LTH2 ,&no-touch-radio JCN
93
-		.Mouse/x DEI2 .window/x1 PEK2 #008c ADD2 GTH2 ,&no-touch-radio JCN
94
-		.Mouse/x DEI2 .window/x1 PEK2 SUB2 #0050 SUB2 STEP8 2/ #0008 DIV2 SWP POP .selection POK
92
+		.Mouse/x DEI2 .window/x1 LDZ2 #0050 ADD2 LTH2 ,&no-touch-radio JCN
93
+		.Mouse/x DEI2 .window/x1 LDZ2 #008c ADD2 GTH2 ,&no-touch-radio JCN
94
+		.Mouse/x DEI2 .window/x1 LDZ2 SUB2 #0050 SUB2 STEP8 2/ #0008 DIV2 SWP POP .selection STZ
95 95
 	&no-touch-radio
96 96
 	POP2
97 97
 
... ...
@@ -102,25 +102,25 @@ BRK
102 102
 
103 103
 @update-theme ( -- )
104 104
 
105
-	#08 DEI #0f AND .theme/r1 PEK #40 SFT ADD #08 DEO
106
-	#0a DEI #0f AND .theme/g1 PEK #40 SFT ADD #0a DEO
107
-	#0c DEI #0f AND .theme/b1 PEK #40 SFT ADD #0c DEO
108
-	#08 DEI #f0 AND .theme/r2 PEK ADD #08 DEO
109
-	#0a DEI #f0 AND .theme/g2 PEK ADD #0a DEO
110
-	#0c DEI #f0 AND .theme/b2 PEK ADD #0c DEO
111
-	#09 DEI #0f AND .theme/r3 PEK #40 SFT ADD #09 DEO
112
-	#0b DEI #0f AND .theme/g3 PEK #40 SFT ADD #0b DEO
113
-	#0d DEI #0f AND .theme/b3 PEK #40 SFT ADD #0d DEO
114
-	#09 DEI #f0 AND .theme/r4 PEK ADD #09 DEO
115
-	#0b DEI #f0 AND .theme/g4 PEK ADD #0b DEO
116
-	#0d DEI #f0 AND .theme/b4 PEK ADD #0d DEO
105
+	#08 DEI #0f AND .theme/r1 LDZ #40 SFT ADD #08 DEO
106
+	#0a DEI #0f AND .theme/g1 LDZ #40 SFT ADD #0a DEO
107
+	#0c DEI #0f AND .theme/b1 LDZ #40 SFT ADD #0c DEO
108
+	#08 DEI #f0 AND .theme/r2 LDZ ADD #08 DEO
109
+	#0a DEI #f0 AND .theme/g2 LDZ ADD #0a DEO
110
+	#0c DEI #f0 AND .theme/b2 LDZ ADD #0c DEO
111
+	#09 DEI #0f AND .theme/r3 LDZ #40 SFT ADD #09 DEO
112
+	#0b DEI #0f AND .theme/g3 LDZ #40 SFT ADD #0b DEO
113
+	#0d DEI #0f AND .theme/b3 LDZ #40 SFT ADD #0d DEO
114
+	#09 DEI #f0 AND .theme/r4 LDZ ADD #09 DEO
115
+	#0b DEI #f0 AND .theme/g4 LDZ ADD #0b DEO
116
+	#0d DEI #f0 AND .theme/b4 LDZ ADD #0d DEO
117 117
 
118 118
 RTN
119 119
 
120 120
 @draw-background ( -- )
121 121
 	
122 122
 	( draw hor line )
123
-	#0000 .Screen/x DEO2 .center/y PEK2 .Screen/y DEO2
123
+	#0000 .Screen/x DEO2 .center/y LDZ2 .Screen/y DEO2
124 124
 	#0000 .Screen/width DEI2 ( from/to )
125 125
 	&draw-hor
126 126
 		( draw ) #01 .Screen/color DEO
... ...
@@ -129,7 +129,7 @@ RTN
129 129
 	POP2 POP2
130 130
 
131 131
 	( draw ver line )
132
-	.center/x PEK2 .Screen/x DEO2 #0000 .Screen/y DEO2
132
+	.center/x LDZ2 .Screen/x DEO2 #0000 .Screen/y DEO2
133 133
 	#0000 .Screen/height DEI2 ( from/to )
134 134
 	&draw-ver
135 135
 		( draw ) #02 .Screen/color DEO
... ...
@@ -192,46 +192,46 @@ RTN
192 192
 
193 193
 @draw-window ( -- )
194 194
 	
195
-	.window/x1 PEK2 .window/w PEK2 ADD2 .window/x2 POK2
196
-	.window/y1 PEK2 .window/h PEK2 ADD2 .window/y2 POK2
197
-	.window/x1 PEK2 .window/y1 PEK2 .window/x2 PEK2 .window/y2 PEK2 #02 ;fill-rect JSR2
198
-	.window/x1 PEK2 .window/y1 PEK2 .window/x2 PEK2 .window/y2 PEK2 #01 ;line-rect JSR2
199
-	.window/x1 PEK2 #0002 SUB2 .window/y1 PEK2 #0002 SUB2 .window/x2 PEK2 #0002 ADD2 .window/y2 PEK2 #0002 ADD2 #01 ;line-rect JSR2
200
-
201
-	.window/x1 PEK2 #0008 ADD2 .window/y1 PEK2 #0010 ADD2 ;red_txt #25 ;draw-label JSR2
202
-	.window/x1 PEK2 #0038 ADD2 .Screen/x DEO2 
195
+	.window/x1 LDZ2 .window/w LDZ2 ADD2 .window/x2 STZ2
196
+	.window/y1 LDZ2 .window/h LDZ2 ADD2 .window/y2 STZ2
197
+	.window/x1 LDZ2 .window/y1 LDZ2 .window/x2 LDZ2 .window/y2 LDZ2 #02 ;fill-rect JSR2
198
+	.window/x1 LDZ2 .window/y1 LDZ2 .window/x2 LDZ2 .window/y2 LDZ2 #01 ;line-rect JSR2
199
+	.window/x1 LDZ2 #0002 SUB2 .window/y1 LDZ2 #0002 SUB2 .window/x2 LDZ2 #0002 ADD2 .window/y2 LDZ2 #0002 ADD2 #01 ;line-rect JSR2
200
+
201
+	.window/x1 LDZ2 #0008 ADD2 .window/y1 LDZ2 #0010 ADD2 ;red_txt #25 ;draw-label JSR2
202
+	.window/x1 LDZ2 #0038 ADD2 .Screen/x DEO2 
203 203
 	.System/r DEI2 #28 ;draw-short JSR2
204 204
 
205
-	.window/x1 PEK2 #0008 ADD2 .window/y1 PEK2 #0020 ADD2 ;green_txt #25 ;draw-label JSR2
206
-	.window/x1 PEK2 #0038 ADD2 .Screen/x DEO2 
205
+	.window/x1 LDZ2 #0008 ADD2 .window/y1 LDZ2 #0020 ADD2 ;green_txt #25 ;draw-label JSR2
206
+	.window/x1 LDZ2 #0038 ADD2 .Screen/x DEO2 
207 207
 	.System/g DEI2 #28 ;draw-short JSR2
208 208
 
209
-	.window/x1 PEK2 #0008 ADD2 .window/y1 PEK2 #0030 ADD2 ;blue_txt #25 ;draw-label JSR2
210
-	.window/x1 PEK2 #0038 ADD2 .Screen/x DEO2 
209
+	.window/x1 LDZ2 #0008 ADD2 .window/y1 LDZ2 #0030 ADD2 ;blue_txt #25 ;draw-label JSR2
210
+	.window/x1 LDZ2 #0038 ADD2 .Screen/x DEO2 
211 211
 	.System/b DEI2 #28 ;draw-short JSR2
212 212
 
213
-	.window/x1 PEK2 #0060 ADD2 .window/y1 PEK2 #0010 ADD2 .window/x1 PEK2 #0090 ADD2 #00 ;theme/r1 .selection PEK ADD LDA #0004 MUL2 #01 ;draw-slider JSR2
214
-	.window/x1 PEK2 #0060 ADD2 .window/y1 PEK2 #0020 ADD2 .window/x1 PEK2 #0090 ADD2 #00 ;theme/g1 .selection PEK ADD LDA #0004 MUL2 #01 ;draw-slider JSR2
215
-	.window/x1 PEK2 #0060 ADD2 .window/y1 PEK2 #0030 ADD2 .window/x1 PEK2 #0090 ADD2 #00 ;theme/b1 .selection PEK ADD LDA #0004 MUL2 #01 ;draw-slider JSR2
213
+	.window/x1 LDZ2 #0060 ADD2 .window/y1 LDZ2 #0010 ADD2 .window/x1 LDZ2 #0090 ADD2 #00 ;theme/r1 .selection LDZ ADD LDA #0004 MUL2 #01 ;draw-slider JSR2
214
+	.window/x1 LDZ2 #0060 ADD2 .window/y1 LDZ2 #0020 ADD2 .window/x1 LDZ2 #0090 ADD2 #00 ;theme/g1 .selection LDZ ADD LDA #0004 MUL2 #01 ;draw-slider JSR2
215
+	.window/x1 LDZ2 #0060 ADD2 .window/y1 LDZ2 #0030 ADD2 .window/x1 LDZ2 #0090 ADD2 #00 ;theme/b1 .selection LDZ ADD LDA #0004 MUL2 #01 ;draw-slider JSR2
216 216
 
217
-	.window/x1 PEK2 #0050 ADD2 .Screen/x DEO2
218
-	.window/y1 PEK2 #0040 ADD2 .Screen/y DEO2
219
-	;radio_icns #00 .selection PEK #00 EQU #0008 MUL2 ADD2 .Screen/addr DEO2
217
+	.window/x1 LDZ2 #0050 ADD2 .Screen/x DEO2
218
+	.window/y1 LDZ2 #0040 ADD2 .Screen/y DEO2
219
+	;radio_icns #00 .selection LDZ #00 EQU #0008 MUL2 ADD2 .Screen/addr DEO2
220 220
 	#25 .Screen/color DEO
221 221
 
222
-	.window/x1 PEK2 #0060 ADD2 .Screen/x DEO2
223
-	.window/y1 PEK2 #0040 ADD2 .Screen/y DEO2
224
-	;radio_icns #00 .selection PEK #01 EQU #0008 MUL2 ADD2 .Screen/addr DEO2
222
+	.window/x1 LDZ2 #0060 ADD2 .Screen/x DEO2
223
+	.window/y1 LDZ2 #0040 ADD2 .Screen/y DEO2
224
+	;radio_icns #00 .selection LDZ #01 EQU #0008 MUL2 ADD2 .Screen/addr DEO2
225 225
 	#25 .Screen/color DEO
226 226
 
227
-	.window/x1 PEK2 #0070 ADD2 .Screen/x DEO2
228
-	.window/y1 PEK2 #0040 ADD2 .Screen/y DEO2
229
-	;radio_icns #00 .selection PEK #02 EQU #0008 MUL2 ADD2 .Screen/addr DEO2
227
+	.window/x1 LDZ2 #0070 ADD2 .Screen/x DEO2
228
+	.window/y1 LDZ2 #0040 ADD2 .Screen/y DEO2
229
+	;radio_icns #00 .selection LDZ #02 EQU #0008 MUL2 ADD2 .Screen/addr DEO2
230 230
 	#25 .Screen/color DEO
231 231
 
232
-	.window/x1 PEK2 #0080 ADD2 .Screen/x DEO2
233
-	.window/y1 PEK2 #0040 ADD2 .Screen/y DEO2
234
-	;radio_icns #00 .selection PEK #03 EQU #0008 MUL2 ADD2 .Screen/addr DEO2
232
+	.window/x1 LDZ2 #0080 ADD2 .Screen/x DEO2
233
+	.window/y1 LDZ2 #0040 ADD2 .Screen/y DEO2
234
+	;radio_icns #00 .selection LDZ #03 EQU #0008 MUL2 ADD2 .Screen/addr DEO2
235 235
 	#25 .Screen/color DEO
236 236
 
237 237
 RTN
... ...
@@ -240,27 +240,27 @@ RTN
240 240
 	
241 241
 	( clear last cursor )
242 242
 	;pointer_icn .Screen/addr DEO2
243
-	.pointer/x PEK2 .Screen/x DEO2
244
-	.pointer/y PEK2 .Screen/y DEO2
243
+	.pointer/x LDZ2 .Screen/x DEO2
244
+	.pointer/y LDZ2 .Screen/y DEO2
245 245
 	#30 .Screen/color DEO
246 246
 
247 247
 	( record pointer positions )
248
-	.Mouse/x DEI2 .pointer/x POK2 
249
-	.Mouse/y DEI2 .pointer/y POK2
248
+	.Mouse/x DEI2 .pointer/x STZ2 
249
+	.Mouse/y DEI2 .pointer/y STZ2
250 250
 
251 251
 	( draw new cursor )
252
-	.pointer/x PEK2 .Screen/x DEO2
253
-	.pointer/y PEK2 .Screen/y DEO2
252
+	.pointer/x LDZ2 .Screen/x DEO2
253
+	.pointer/y LDZ2 .Screen/y DEO2
254 254
 	#33 .Mouse/state DEI #00 NEQ #02 MUL SUB .Screen/color DEO
255 255
 
256 256
 RTN
257 257
 
258 258
 @draw-slider ( x1* y* x2* pos* color -- )
259 259
 	
260
-	( load ) .color POK .slider/pos POK2 .slider/x2 POK2 .slider/y POK2 .slider/x1 POK2
260
+	( load ) .color STZ .slider/pos STZ2 .slider/x2 STZ2 .slider/y STZ2 .slider/x1 STZ2
261 261
 
262
-	.slider/x1 PEK2 .Screen/x DEO2
263
-	.slider/y PEK2 .Screen/y DEO2
262
+	.slider/x1 LDZ2 .Screen/x DEO2
263
+	.slider/y LDZ2 .Screen/y DEO2
264 264
 	;halftone_icn .Screen/addr DEO2
265 265
 
266 266
 	;slidera_icn .Screen/addr DEO2
... ...
@@ -270,13 +270,13 @@ RTN
270 270
 	&loop
271 271
 		( incr ) .Screen/x DEI2 8+ .Screen/x DEO2
272 272
 		( draw ) #25 .Screen/color DEO
273
-		.Screen/x DEI2 .slider/x2 PEK2 #0008 ADD2 LTH2 ,&loop JCN
273
+		.Screen/x DEI2 .slider/x2 LDZ2 #0008 ADD2 LTH2 ,&loop JCN
274 274
 
275 275
 	( incr ) .Screen/x DEI2 #0004 ADD2 .Screen/x DEO2
276 276
 	;sliderc_icn .Screen/addr DEO2
277 277
 	( draw ) #25 .Screen/color DEO
278 278
 
279
-	.slider/x1 PEK2 .slider/pos PEK2 ADD2 .Screen/x DEO2
279
+	.slider/x1 LDZ2 .slider/pos LDZ2 ADD2 .Screen/x DEO2
280 280
 	;sliderd_icn .Screen/addr DEO2
281 281
 	( draw ) #2a .Screen/color DEO
282 282
 
... ...
@@ -284,14 +284,14 @@ RTN
284 284
 
285 285
 @fill-rect ( x1* y1* x2* y2* color -- )
286 286
 	
287
-	.color POK
287
+	.color STZ
288 288
 	( x1 x2 y1 y2 ) ROT2 SWP2
289 289
 	&ver
290 290
 		( save ) OVR2 .Screen/y DEO2
291 291
 		STH2 STH2 OVR2 OVR2
292 292
 		&hor
293 293
 			( save ) OVR2 .Screen/x DEO2
294
-			( draw ) .color PEK .Screen/color DEO
294
+			( draw ) .color LDZ .Screen/color DEO
295 295
 			( incr ) SWP2 #0001 ADD2 SWP2
296 296
 			OVR2 OVR2 LTH2 ,&hor JCN
297 297
 		POP2 POP2 STH2r STH2r
... ...
@@ -303,18 +303,18 @@ RTN
303 303
 
304 304
 @line-rect ( x1* y1* x2* y2* color -- )
305 305
 
306
-	( load ) .color POK .rect/y2 POK2 .rect/x2 POK2 DUP2 .Screen/y DEO2 .rect/y1 POK2 DUP2 .Screen/x DEO2 .rect/x1 POK2
306
+	( load ) .color STZ .rect/y2 STZ2 .rect/x2 STZ2 DUP2 .Screen/y DEO2 .rect/y1 STZ2 DUP2 .Screen/x DEO2 .rect/x1 STZ2
307 307
 	&hor
308 308
 		( incr ) .Screen/x DEI2 ++ .Screen/x DEO2
309
-		( draw ) .rect/y1 PEK2 .Screen/y DEO2 .color PEK .Screen/color DEO
310
-		( draw ) .rect/y2 PEK2 .Screen/y DEO2 .color PEK .Screen/color DEO
311
-		.Screen/x DEI2 .rect/x2 PEK2 LTH2 ,&hor JCN
312
-	.rect/y1 PEK2 .Screen/y DEO2
309
+		( draw ) .rect/y1 LDZ2 .Screen/y DEO2 .color LDZ .Screen/color DEO
310
+		( draw ) .rect/y2 LDZ2 .Screen/y DEO2 .color LDZ .Screen/color DEO
311
+		.Screen/x DEI2 .rect/x2 LDZ2 LTH2 ,&hor JCN
312
+	.rect/y1 LDZ2 .Screen/y DEO2
313 313
 	&ver
314
-		( draw ) .rect/x1 PEK2 .Screen/x DEO2 .color PEK .Screen/color DEO
315
-		( draw ) .rect/x2 PEK2 .Screen/x DEO2 .color PEK .Screen/color DEO
314
+		( draw ) .rect/x1 LDZ2 .Screen/x DEO2 .color LDZ .Screen/color DEO
315
+		( draw ) .rect/x2 LDZ2 .Screen/x DEO2 .color LDZ .Screen/color DEO
316 316
 		( incr ) .Screen/y DEI2 ++ .Screen/y DEO2
317
-		.Screen/y DEI2 .rect/y2 PEK2 ++ LTH2 ,&ver JCN
317
+		.Screen/y DEI2 .rect/y2 LDZ2 ++ LTH2 ,&ver JCN
318 318
 
319 319
 RTN
320 320
 
... ...
@@ -31,11 +31,11 @@ BRK
31 31
 
32 32
 @on-frame ( -> )
33 33
 
34
-	( incr ) .timer PEK #01 ADD .timer POK 
35
-	( skip ) .timer PEK #10 EQU #01 JCN [ BRK ]
34
+	( incr ) .timer LDZ #01 ADD .timer STZ 
35
+	( skip ) .timer LDZ #10 EQU #01 JCN [ BRK ]
36 36
 
37 37
 	( get note )
38
-	;melody #00 .progress PEK ADD2 LDA 
38
+	;melody #00 .progress LDZ ADD2 LDA 
39 39
 
40 40
 	( play note )
41 41
 	DUP .Audio0/pitch DEO
... ...
@@ -45,13 +45,13 @@ BRK
45 45
 
46 46
 	( draw note )
47 47
 	#00 SWP #0004 MUL2 #0100 SUB2 .Screen/y DEO2
48
-	#00 .progress PEK #0008 MUL2 .Screen/x DEO2
48
+	#00 .progress LDZ #0008 MUL2 .Screen/x DEO2
49 49
 	;dot .Screen/addr DEO2
50 50
 	#21 .Screen/color DEO
51 51
 
52
-	( incr ) .progress PEK #01 ADD #20 MOD .progress POK
52
+	( incr ) .progress LDZ #01 ADD #20 MOD .progress STZ
53 53
 
54
-	#00 .timer POK
54
+	#00 .timer STZ
55 55
 
56 56
 BRK
57 57
 
... ...
@@ -58,23 +58,23 @@ RTN
58 58
 RTN
59 59
 
60 60
 @print-decimal ( short -- )
61
-	#00 .number/started POK
61
+	#00 .number/started STZ
62 62
 	DUP2 #2710 DIV2 DUP2 ,&digit JSR #2710 MUL2 SUB2
63 63
 	DUP2 #03e8 DIV2 DUP2 ,&digit JSR #03e8 MUL2 SUB2
64 64
 	DUP2 #0064 DIV2 DUP2 ,&digit JSR #0064 MUL2 SUB2
65 65
 	DUP2 #000a DIV2 DUP2 ,&digit JSR #000a MUL2 SUB2
66 66
 	                     ,&digit JSR
67
-	.number/started PEK ,&end JCN
67
+	.number/started LDZ ,&end JCN
68 68
 	LIT '0 .Console/char DEO
69 69
 	&end
70 70
 RTN
71 71
 
72 72
 	&digit
73 73
 	SWP POP
74
-	DUP .number/started PEK ORA #02 JCN
74
+	DUP .number/started LDZ ORA #02 JCN
75 75
 	POP JMP2r
76 76
 	LIT '0 ADD .Console/char DEO
77
-	#01 .number/started POK
77
+	#01 .number/started STZ
78 78
 RTN
79 79
 
80 80
 @char-txt "char: 20 $1
... ...
@@ -33,19 +33,19 @@
33 33
 
34 34
 	;default_icn .Screen/addr DEO2
35 35
 	#31 .Screen/color DEO
36
-	#2a .slime POK
36
+	#2a .slime STZ
37 37
 
38 38
 BRK
39 39
 
40 40
 @on-frame ( -> )
41 41
 
42
-	#2a .slime POK
42
+	#2a .slime STZ
43 43
 	;default_icn .Screen/addr DEO2
44 44
 
45 45
 	( hold ctrl key to change slime color )
46 46
 	.Controller/button DEI #0f AND
47
-		DUP #01 NEQ ,&no-ctrl JCN #25 .slime POK &no-ctrl
48
-		DUP #02 NEQ ,&no-alt JCN #2f .slime POK &no-alt
47
+		DUP #01 NEQ ,&no-ctrl JCN #25 .slime STZ &no-ctrl
48
+		DUP #02 NEQ ,&no-alt JCN #2f .slime STZ &no-alt
49 49
 	POP
50 50
 
51 51
 	( clear ) #30 .Screen/color DEO
... ...
@@ -75,7 +75,7 @@ BRK
75 75
 
76 76
 	( draw slime )
77 77
 	;slime_icn .Screen/addr DEO2
78
-	.slime PEK .Screen/color DEO
78
+	.slime LDZ .Screen/color DEO
79 79
 
80 80
 BRK
81 81
 
... ...
@@ -41,30 +41,30 @@ BRK
41 41
 @on-frame ( -> )
42 42
 
43 43
 	( only draw once per second )
44
-	( skip ) .DateTime/second DEI .current PEK NEQ #01 JCN [ BRK ]
44
+	( skip ) .DateTime/second DEI .current LDZ NEQ #01 JCN [ BRK ]
45 45
 
46
-	.DateTime/second DEI .current POK
46
+	.DateTime/second DEI .current STZ
47 47
 
48 48
 	( clear )
49
-	#0080 SCALEX #0080 SCALEY .needles/sx PEK2 .needles/sy PEK2 #00 ;draw-line JSR2
50
-	#0080 SCALEX #0080 SCALEY .needles/mx PEK2 .needles/my PEK2 #00 ;draw-line JSR2
51
-	#0080 SCALEX #0080 SCALEY .needles/hx PEK2 .needles/hy PEK2 #00 ;draw-line JSR2
49
+	#0080 SCALEX #0080 SCALEY .needles/sx LDZ2 .needles/sy LDZ2 #00 ;draw-line JSR2
50
+	#0080 SCALEX #0080 SCALEY .needles/mx LDZ2 .needles/my LDZ2 #00 ;draw-line JSR2
51
+	#0080 SCALEX #0080 SCALEY .needles/hx LDZ2 .needles/hy LDZ2 #00 ;draw-line JSR2
52 52
 
53 53
 	( place )
54 54
 	#00 .DateTime/second DEI #0002 MUL2 ;table ADD2 LDA2
55
-		#00 SWP SCALEY .needles/sy POK2
56
-		#00 SWP SCALEX .needles/sx POK2
55
+		#00 SWP SCALEY .needles/sy STZ2
56
+		#00 SWP SCALEX .needles/sx STZ2
57 57
 	#00 .DateTime/minute DEI #0002 MUL2 ;table ADD2 LDA2
58
-		#00 SWP #0004 DIV2 #0003 MUL2 #0020 ADD2 SCALEY .needles/my POK2
59
-		#00 SWP #0004 DIV2 #0003 MUL2 #0020 ADD2 SCALEX .needles/mx POK2
58
+		#00 SWP #0004 DIV2 #0003 MUL2 #0020 ADD2 SCALEY .needles/my STZ2
59
+		#00 SWP #0004 DIV2 #0003 MUL2 #0020 ADD2 SCALEX .needles/mx STZ2
60 60
 	#00 .DateTime/hour DEI 12HOURS #05 MUL #0002 MUL2 ;table ADD2 LDA2
61
-		#00 SWP #0002 DIV2 #0040 ADD2 SCALEY .needles/hy POK2
62
-		#00 SWP #0002 DIV2 #0040 ADD2 SCALEX .needles/hx POK2
61
+		#00 SWP #0002 DIV2 #0040 ADD2 SCALEY .needles/hy STZ2
62
+		#00 SWP #0002 DIV2 #0040 ADD2 SCALEX .needles/hx STZ2
63 63
 
64 64
 	( needles )
65
-	#0080 SCALEX #0080 SCALEY .needles/sx PEK2 .needles/sy PEK2 #02 ;draw-line JSR2
66
-	#0080 SCALEX #0080 SCALEY .needles/mx PEK2 .needles/my PEK2 #01 ;draw-line JSR2
67
-	#0080 SCALEX #0080 SCALEY .needles/hx PEK2 .needles/hy PEK2 #03 ;draw-line JSR2
65
+	#0080 SCALEX #0080 SCALEY .needles/sx LDZ2 .needles/sy LDZ2 #02 ;draw-line JSR2
66
+	#0080 SCALEX #0080 SCALEY .needles/mx LDZ2 .needles/my LDZ2 #01 ;draw-line JSR2
67
+	#0080 SCALEX #0080 SCALEY .needles/hx LDZ2 .needles/hy LDZ2 #03 ;draw-line JSR2
68 68
 
69 69
 	( circle )
70 70
 	#00 #3c
... ...
@@ -109,26 +109,26 @@ RTN
109 109
 
110 110
 @draw-line ( x1 y1 x2 y2 color -- )
111 111
 	
112
-	( load ) .color POK .line/y0 POK2 .line/x0 POK2 .line/y POK2 .line/x POK2
113
-	.line/x0 PEK2 .line/x PEK2 SUB2 ABS2 .line/dx POK2
114
-	.line/y0 PEK2 .line/y PEK2 SUB2 ABS2 #0000 SWP2 SUB2 .line/dy POK2
115
-	#ffff #00 .line/x PEK2 .line/x0 PEK2 LTS2 #0002 MUL2 ADD2 .line/sx POK2
116
-	#ffff #00 .line/y PEK2 .line/y0 PEK2 LTS2 #0002 MUL2 ADD2 .line/sy POK2
117
-	.line/dx PEK2 .line/dy PEK2 ADD2 .line/e1 POK2
112
+	( load ) .color STZ .line/y0 STZ2 .line/x0 STZ2 .line/y STZ2 .line/x STZ2
113
+	.line/x0 LDZ2 .line/x LDZ2 SUB2 ABS2 .line/dx STZ2
114
+	.line/y0 LDZ2 .line/y LDZ2 SUB2 ABS2 #0000 SWP2 SUB2 .line/dy STZ2
115
+	#ffff #00 .line/x LDZ2 .line/x0 LDZ2 LTS2 #0002 MUL2 ADD2 .line/sx STZ2
116
+	#ffff #00 .line/y LDZ2 .line/y0 LDZ2 LTS2 #0002 MUL2 ADD2 .line/sy STZ2
117
+	.line/dx LDZ2 .line/dy LDZ2 ADD2 .line/e1 STZ2
118 118
 	&loop
119
-		.line/x PEK2 .Screen/x DEO2 
120
-		.line/y PEK2 .Screen/y DEO2 
121
-		.color PEK .Screen/color DEO
122
-		[ .line/x PEK2 .line/x0 PEK2 EQU2 ] 
123
-		[ .line/y PEK2 .line/y0 PEK2 EQU2 ] #0101 EQU2 ,&end JCN
124
-		.line/e1 PEK2 #0002 MUL2 .line/e2 POK2
125
-		.line/e2 PEK2 .line/dy PEK2 LTS2 ,&skipy JCN
126
-			.line/e1 PEK2 .line/dy PEK2 ADD2 .line/e1 POK2
127
-			.line/x PEK2 .line/sx PEK2 ADD2 .line/x POK2
119
+		.line/x LDZ2 .Screen/x DEO2 
120
+		.line/y LDZ2 .Screen/y DEO2 
121
+		.color LDZ .Screen/color DEO
122
+		[ .line/x LDZ2 .line/x0 LDZ2 EQU2 ] 
123
+		[ .line/y LDZ2 .line/y0 LDZ2 EQU2 ] #0101 EQU2 ,&end JCN
124
+		.line/e1 LDZ2 #0002 MUL2 .line/e2 STZ2
125
+		.line/e2 LDZ2 .line/dy LDZ2 LTS2 ,&skipy JCN
126
+			.line/e1 LDZ2 .line/dy LDZ2 ADD2 .line/e1 STZ2
127
+			.line/x LDZ2 .line/sx LDZ2 ADD2 .line/x STZ2
128 128
 		&skipy
129
-		.line/e2 PEK2 .line/dx PEK2 GTS2 ,&skipx JCN
130
-			.line/e1 PEK2 .line/dx PEK2 ADD2 .line/e1 POK2
131
-			.line/y PEK2 .line/sy PEK2 ADD2 .line/y POK2
129
+		.line/e2 LDZ2 .line/dx LDZ2 GTS2 ,&skipx JCN
130
+			.line/e1 LDZ2 .line/dx LDZ2 ADD2 .line/e1 STZ2
131
+			.line/y LDZ2 .line/sy LDZ2 ADD2 .line/y STZ2
132 132
 		&skipx
133 133
 		;&loop JMP2
134 134
 	&end
... ...
@@ -36,37 +36,37 @@ BRK
36 36
 	;draw-cursor JSR2
37 37
 
38 38
 	( on down )
39
-	.Mouse/state DEI #00 NEQ .pointer/state PEK #00 EQU #0101 EQU2 ,on-mouse-down JCN
39
+	.Mouse/state DEI #00 NEQ .pointer/state LDZ #00 EQU #0101 EQU2 ,on-mouse-down JCN
40 40
 
41 41
 	( on drag )
42 42
 	.Mouse/state DEI #00 NEQ ,on-mouse-drag JCN
43
-	.Mouse/state DEI .pointer/state POK
43
+	.Mouse/state DEI .pointer/state STZ
44 44
 
45 45
 BRK 
46 46
 
47 47
 @on-mouse-down ( -> )
48 48
 
49 49
 	( record start position )
50
-	.Mouse/x DEI2 DUP2 .pointer/x POK2 .pointer/lastx POK2 
51
-	.Mouse/y DEI2 DUP2 .pointer/y POK2 .pointer/lasty POK2
52
-	.Mouse/state DEI .pointer/state POK
50
+	.Mouse/x DEI2 DUP2 .pointer/x STZ2 .pointer/lastx STZ2 
51
+	.Mouse/y DEI2 DUP2 .pointer/y STZ2 .pointer/lasty STZ2
52
+	.Mouse/state DEI .pointer/state STZ
53 53
 
54 54
 BRK
55 55
 
56 56
 @on-mouse-drag ( -> )
57 57
 	
58 58
 	( draw line )
59
-	.pointer/lastx PEK2 
60
-	.pointer/lasty PEK2 
61
-	.pointer/x PEK2 
62
-	.pointer/y PEK2 
59
+	.pointer/lastx LDZ2 
60
+	.pointer/lasty LDZ2 
61
+	.pointer/x LDZ2 
62
+	.pointer/y LDZ2 
63 63
 	#01 [ .Mouse/state DEI #10 EQU #02 MUL ADD ] 
64 64
 	;draw-line JSR2
65 65
 
66 66
 	( record last position )
67
-	.Mouse/x DEI2 .pointer/lastx POK2 
68
-	.Mouse/y DEI2 .pointer/lasty POK2
69
-	.Mouse/state DEI .pointer/state POK
67
+	.Mouse/x DEI2 .pointer/lastx STZ2 
68
+	.Mouse/y DEI2 .pointer/lasty STZ2
69
+	.Mouse/state DEI .pointer/state STZ
70 70
 
71 71
 BRK
72 72
 
... ...
@@ -74,44 +74,44 @@ BRK
74 74
 	
75 75
 	( clear last cursor )
76 76
 	#fff8 .Screen/addr DEO2
77
-	.pointer/x PEK2 .Screen/x DEO2
78
-	.pointer/y PEK2 .Screen/y DEO2
77
+	.pointer/x LDZ2 .Screen/x DEO2
78
+	.pointer/y LDZ2 .Screen/y DEO2
79 79
 	#30 .Screen/color DEO
80 80
 
81 81
 	( record pointer positions )
82
-	.Mouse/x DEI2 .pointer/x POK2 
83
-	.Mouse/y DEI2 .pointer/y POK2
82
+	.Mouse/x DEI2 .pointer/x STZ2 
83
+	.Mouse/y DEI2 .pointer/y STZ2
84 84
 
85 85
 	( draw new cursor )
86 86
 	;pointer_icn .Screen/addr DEO2
87
-	.pointer/x PEK2 .Screen/x DEO2
88
-	.pointer/y PEK2 .Screen/y DEO2
87
+	.pointer/x LDZ2 .Screen/x DEO2
88
+	.pointer/y LDZ2 .Screen/y DEO2
89 89
 	#33 .Mouse/state DEI #00 NEQ #02 MUL SUB .Screen/color DEO
90 90
 
91 91
 RTN
92 92
 
93 93
 @draw-line ( x1 y1 x2 y2 color -- )
94 94
 	
95
-	( load ) .color POK .line/y0 POK2 .line/x0 POK2 .line/y POK2 .line/x POK2
96
-	.line/x0 PEK2 .line/x PEK2 SUB2 ABS2 .line/dx POK2
97
-	.line/y0 PEK2 .line/y PEK2 SUB2 ABS2 #0000 SWP2 SUB2 .line/dy POK2
98
-	#ffff #00 .line/x PEK2 .line/x0 PEK2 LTS2 #0002 MUL2 ADD2 .line/sx POK2
99
-	#ffff #00 .line/y PEK2 .line/y0 PEK2 LTS2 #0002 MUL2 ADD2 .line/sy POK2
100
-	.line/dx PEK2 .line/dy PEK2 ADD2 .line/e1 POK2
95
+	( load ) .color STZ .line/y0 STZ2 .line/x0 STZ2 .line/y STZ2 .line/x STZ2
96
+	.line/x0 LDZ2 .line/x LDZ2 SUB2 ABS2 .line/dx STZ2
97
+	.line/y0 LDZ2 .line/y LDZ2 SUB2 ABS2 #0000 SWP2 SUB2 .line/dy STZ2
98
+	#ffff #00 .line/x LDZ2 .line/x0 LDZ2 LTS2 #0002 MUL2 ADD2 .line/sx STZ2
99
+	#ffff #00 .line/y LDZ2 .line/y0 LDZ2 LTS2 #0002 MUL2 ADD2 .line/sy STZ2
100
+	.line/dx LDZ2 .line/dy LDZ2 ADD2 .line/e1 STZ2
101 101
 	&loop
102
-		.line/x PEK2 .Screen/x DEO2 
103
-		.line/y PEK2 .Screen/y DEO2 
104
-		.color PEK .Screen/color DEO
105
-		[ .line/x PEK2 .line/x0 PEK2 EQU2 ] 
106
-		[ .line/y PEK2 .line/y0 PEK2 EQU2 ] #0101 EQU2 ,&end JCN
107
-		.line/e1 PEK2 #0002 MUL2 .line/e2 POK2
108
-		.line/e2 PEK2 .line/dy PEK2 LTS2 ,&skipy JCN
109
-			.line/e1 PEK2 .line/dy PEK2 ADD2 .line/e1 POK2
110
-			.line/x PEK2 .line/sx PEK2 ADD2 .line/x POK2
102
+		.line/x LDZ2 .Screen/x DEO2 
103
+		.line/y LDZ2 .Screen/y DEO2 
104
+		.color LDZ .Screen/color DEO
105
+		[ .line/x LDZ2 .line/x0 LDZ2 EQU2 ] 
106
+		[ .line/y LDZ2 .line/y0 LDZ2 EQU2 ] #0101 EQU2 ,&end JCN
107
+		.line/e1 LDZ2 #0002 MUL2 .line/e2 STZ2
108
+		.line/e2 LDZ2 .line/dy LDZ2 LTS2 ,&skipy JCN
109
+			.line/e1 LDZ2 .line/dy LDZ2 ADD2 .line/e1 STZ2
110
+			.line/x LDZ2 .line/sx LDZ2 ADD2 .line/x STZ2
111 111
 		&skipy
112
-		.line/e2 PEK2 .line/dx PEK2 GTS2 ,&skipx JCN
113
-			.line/e1 PEK2 .line/dx PEK2 ADD2 .line/e1 POK2
114
-			.line/y PEK2 .line/sy PEK2 ADD2 .line/y POK2
112
+		.line/e2 LDZ2 .line/dx LDZ2 GTS2 ,&skipx JCN
113
+			.line/e1 LDZ2 .line/dx LDZ2 ADD2 .line/e1 STZ2
114
+			.line/y LDZ2 .line/sy LDZ2 ADD2 .line/y STZ2
115 115
 		&skipx
116 116
 		;&loop JMP2
117 117
 	&end
... ...
@@ -24,8 +24,8 @@
24 24
 	#0da4 .System/b DEO2 
25 25
 
26 26
 	( find screen center )
27
-	.Screen/width DEI2 #0002 DIV2 .center/x POK2
28
-	.Screen/height DEI2 #0002 DIV2 .center/y POK2
27
+	.Screen/width DEI2 #0002 DIV2 .center/x STZ2
28
+	.Screen/height DEI2 #0002 DIV2 .center/y STZ2
29 29
 
30 30
 	( draw )
31 31
 	;draw-table JSR2
... ...
@@ -40,9 +40,9 @@ BRK
40 40
 	#00 #00
41 41
 	&loop
42 42
 		( move ) OVR #0f AND #40 SFT #02 DIV #00 SWP 
43
-			.center/x PEK2 #0040 SUB2 ADD2 .Screen/x DEO2
43
+			.center/x LDZ2 #0040 SUB2 ADD2 .Screen/x DEO2
44 44
 		( move ) OVR #f0 AND #02 DIV #00 SWP 
45
-			.center/y PEK2 #0040 SUB2 ADD2 .Screen/y DEO2
45
+			.center/y LDZ2 #0040 SUB2 ADD2 .Screen/y DEO2
46 46
 		( draw ) OVR .Screen/color DEO
47 47
 		( incr ) SWP #01 ADD SWP
48 48
 		DUP2 NEQ ,&loop JCN
... ...
@@ -58,14 +58,14 @@ RTN
58 58
 
59 59
 		( x-axis ) 
60 60
 		OVR #08 MUL #00 SWP 
61
-		.center/x PEK2 #0040 SUB2 ADD2 .Screen/x DEO2
62
-		.center/y PEK2 #0050 SUB2 .Screen/y DEO2
61
+		.center/x LDZ2 #0040 SUB2 ADD2 .Screen/x DEO2
62
+		.center/y LDZ2 #0050 SUB2 .Screen/y DEO2
63 63
 		( draw ) #21 .Screen/color DEO
64 64
 
65 65
 		( y-axis )
66 66
 		OVR #08 MUL #00 SWP 
67
-		.center/y PEK2 #0040 SUB2 ADD2 .Screen/y DEO2
68
-		.center/x PEK2 #0050 SUB2 .Screen/x DEO2
67
+		.center/y LDZ2 #0040 SUB2 ADD2 .Screen/y DEO2
68
+		.center/x LDZ2 #0050 SUB2 .Screen/x DEO2
69 69
 		( draw ) #21 .Screen/color DEO
70 70
 
71 71
 		( incr ) SWP #01 ADD SWP
... ...
@@ -78,15 +78,15 @@ RTN
78 78
 	
79 79
 	;preview_icn .Screen/addr DEO2
80 80
 
81
-	.center/x PEK2 #0048 ADD2 .Screen/x DEO2
82
-	.center/y PEK2 #0030 ADD2 .Screen/y DEO2
81
+	.center/x LDZ2 #0048 ADD2 .Screen/x DEO2
82
+	.center/y LDZ2 #0030 ADD2 .Screen/y DEO2
83 83
 	#21 .Screen/color DEO
84
-	.center/x PEK2 #0050 ADD2 .Screen/x DEO2
84
+	.center/x LDZ2 #0050 ADD2 .Screen/x DEO2
85 85
 	#61 .Screen/color DEO
86
-	.center/x PEK2 #0048 ADD2 .Screen/x DEO2
87
-	.center/y PEK2 #0038 ADD2 .Screen/y DEO2
86
+	.center/x LDZ2 #0048 ADD2 .Screen/x DEO2
87
+	.center/y LDZ2 #0038 ADD2 .Screen/y DEO2
88 88
 	#a1 .Screen/color DEO
89
-	.center/x PEK2 #0050 ADD2 .Screen/x DEO2
89
+	.center/x LDZ2 #0050 ADD2 .Screen/x DEO2
90 90
 	#f1 .Screen/color DEO
91 91
 
92 92
 RTN
... ...
@@ -20,8 +20,8 @@
20 20
 	;on-frame .Screen/vector DEO2
21 21
 
22 22
 	( starting position )
23
-	.Screen/width DEI2 #0002 DIV2 .dvd/x POK2
24
-	.Screen/height DEI2 #0002 DIV2 .dvd/y POK2
23
+	.Screen/width DEI2 #0002 DIV2 .dvd/x STZ2
24
+	.Screen/height DEI2 #0002 DIV2 .dvd/y STZ2
25 25
 	
26 26
 	#21 ;draw-dvd JSR2
27 27
 	
... ...
@@ -30,16 +30,16 @@ BRK
30 30
 @on-frame ( -> )
31 31
 
32 32
 	( clear ) #20 ;draw-dvd JSR2
33
-	( case: hit-right ) .dvd/x PEK2 .Screen/width DEI2 #0020 SUB2 EQU2
34
-	( case: hit-left ) .dvd/x PEK2 #0000 EQU2 
33
+	( case: hit-right ) .dvd/x LDZ2 .Screen/width DEI2 #0020 SUB2 EQU2
34
+	( case: hit-left ) .dvd/x LDZ2 #0000 EQU2 
35 35
 	#0000 EQU2 ,&no-flipx JCN 
36
-		.dvd/dx PEK #00 EQU .dvd/dx POK &no-flipx
37
-	( case: hit-bottom ) .dvd/y PEK2 .Screen/height DEI2 #0010 SUB2 EQU2
38
-	( case: hit-top ) .dvd/y PEK2 #0000 EQU2 
36
+		.dvd/dx LDZ #00 EQU .dvd/dx STZ &no-flipx
37
+	( case: hit-bottom ) .dvd/y LDZ2 .Screen/height DEI2 #0010 SUB2 EQU2
38
+	( case: hit-top ) .dvd/y LDZ2 #0000 EQU2 
39 39
 	#0000 EQU2 ,&no-flipy JCN 
40
-		.dvd/dy PEK #00 EQU .dvd/dy POK &no-flipy
41
-	( incr ) .dvd/x PEK2 #0001 #00 .dvd/dx PEK #00 EQU #fffe MUL2 ADD2 ADD2 .dvd/x POK2
42
-	( incr ) .dvd/y PEK2 #0001 #00 .dvd/dy PEK #00 EQU #fffe MUL2 ADD2 ADD2 .dvd/y POK2
40
+		.dvd/dy LDZ #00 EQU .dvd/dy STZ &no-flipy
41
+	( incr ) .dvd/x LDZ2 #0001 #00 .dvd/dx LDZ #00 EQU #fffe MUL2 ADD2 ADD2 .dvd/x STZ2
42
+	( incr ) .dvd/y LDZ2 #0001 #00 .dvd/dy LDZ #00 EQU #fffe MUL2 ADD2 ADD2 .dvd/y STZ2
43 43
 	( draw ) #21 ;draw-dvd JSR2
44 44
 
45 45
 BRK
... ...
@@ -48,10 +48,10 @@ BRK
48 48
 	
49 49
 	( stash ) STH 
50 50
 	;dvd_icn .Screen/addr DEO2
51
-	.dvd/y PEK2 [ .dvd/y PEK2 #0010 ADD2 ]
51
+	.dvd/y LDZ2 [ .dvd/y LDZ2 #0010 ADD2 ]
52 52
 	&ver
53 53
 		OVR2 .Screen/y DEO2
54
-		.dvd/x PEK2 [ .dvd/x PEK2 #0020 ADD2 ]
54
+		.dvd/x LDZ2 [ .dvd/x LDZ2 #0020 ADD2 ]
55 55
 		&hor
56 56
 			OVR2 .Screen/x DEO2
57 57
 			( draw ) DUPr STHr .Screen/color DEO
... ...
@@ -26,38 +26,38 @@
26 26
 	( theme ) #0f0f .System/r DEO2 #0fff .System/g DEO2 #0ff0 .System/b DEO2
27 27
 	( vectors ) ;on-mouse .Mouse/vector DEO2
28 28
 	
29
-	#0020 #0030 #0060 #0060 .r1/y2 POK2 .r1/x2 POK2 .r1/y1 POK2 .r1/x1 POK2
30
-	#0058 #0050 #0090 #0080 .r2/y2 POK2 .r2/x2 POK2 .r2/y1 POK2 .r2/x1 POK2
31
-	#0048 #0048 #0080 #0098 .r3/y2 POK2 .r3/x2 POK2 .r3/y1 POK2 .r3/x1 POK2
29
+	#0020 #0030 #0060 #0060 .r1/y2 STZ2 .r1/x2 STZ2 .r1/y1 STZ2 .r1/x1 STZ2
30
+	#0058 #0050 #0090 #0080 .r2/y2 STZ2 .r2/x2 STZ2 .r2/y1 STZ2 .r2/x1 STZ2
31
+	#0048 #0048 #0080 #0098 .r3/y2 STZ2 .r3/x2 STZ2 .r3/y1 STZ2 .r3/x1 STZ2
32 32
 
33 33
 ( no BRK, run through to on-mouse )
34 34
 
35 35
 @on-mouse
36 36
 
37
-	;pointer_icn .pointer/sprite POK2
37
+	;pointer_icn .pointer/sprite STZ2
38 38
 
39
-	#01 .color POK
39
+	#01 .color STZ
40 40
 	( matrix comparison )
41
-	.Mouse/x DEI2 .r1/x1 PEK2 GTH2 .Mouse/x DEI2 .r1/x2 PEK2 LTH2 #0101 EQU2
42
-	.Mouse/y DEI2 .r1/y1 PEK2 GTH2 .Mouse/y DEI2 .r1/y2 PEK2 LTH2 #0101 EQU2
43
-	#0101 NEQ2 ,&draw1 JCN #02 .color POK ;hand_icn .pointer/sprite POK2
44
-	&draw1 .r1/x1 PEK2 .r1/y1 PEK2 .r1/x2 PEK2 .r1/y2 PEK2 .color PEK ;line-rect JSR2
41
+	.Mouse/x DEI2 .r1/x1 LDZ2 GTH2 .Mouse/x DEI2 .r1/x2 LDZ2 LTH2 #0101 EQU2
42
+	.Mouse/y DEI2 .r1/y1 LDZ2 GTH2 .Mouse/y DEI2 .r1/y2 LDZ2 LTH2 #0101 EQU2
43
+	#0101 NEQ2 ,&draw1 JCN #02 .color STZ ;hand_icn .pointer/sprite STZ2
44
+	&draw1 .r1/x1 LDZ2 .r1/y1 LDZ2 .r1/x2 LDZ2 .r1/y2 LDZ2 .color LDZ ;line-rect JSR2
45 45
 	
46
-	#01 .color POK
46
+	#01 .color STZ
47 47
 	( 2-step comparison )
48
-	.Mouse/x DEI2 .r2/x1 PEK2 GTH2 .Mouse/x DEI2 .r2/x2 PEK2 LTH2 #0101 NEQ2 ,&draw2 JCN
49
-		.Mouse/y DEI2 .r2/y1 PEK2 GTH2 .Mouse/y DEI2 .r2/y2 PEK2 LTH2 #0101 NEQ2 ,&draw2 JCN
50
-			#03 .color POK ;hand_icn .pointer/sprite POK2
51
-	&draw2 .r2/x1 PEK2 .r2/y1 PEK2 .r2/x2 PEK2 .r2/y2 PEK2 .color PEK ;line-rect JSR2
48
+	.Mouse/x DEI2 .r2/x1 LDZ2 GTH2 .Mouse/x DEI2 .r2/x2 LDZ2 LTH2 #0101 NEQ2 ,&draw2 JCN
49
+		.Mouse/y DEI2 .r2/y1 LDZ2 GTH2 .Mouse/y DEI2 .r2/y2 LDZ2 LTH2 #0101 NEQ2 ,&draw2 JCN
50
+			#03 .color STZ ;hand_icn .pointer/sprite STZ2
51
+	&draw2 .r2/x1 LDZ2 .r2/y1 LDZ2 .r2/x2 LDZ2 .r2/y2 LDZ2 .color LDZ ;line-rect JSR2
52 52
 	
53
-	#01 .color POK
53
+	#01 .color STZ
54 54
 	( 4-step comparison )
55
-	.Mouse/x DEI2 .r3/x1 PEK2 LTH2 ,&draw3 JCN
56
-		.Mouse/x DEI2 .r3/x2 PEK2 GTH2 ,&draw3 JCN
57
-			.Mouse/y DEI2 .r3/y1 PEK2 LTH2 ,&draw3 JCN
58
-				.Mouse/y DEI2 .r3/y2 PEK2 GTH2 ,&draw3 JCN
59
-					#02 .color POK ;hand_icn .pointer/sprite POK2
60
-	&draw3 .r3/x1 PEK2 .r3/y1 PEK2 .r3/x2 PEK2 .r3/y2 PEK2 .color PEK ;line-rect JSR2
55
+	.Mouse/x DEI2 .r3/x1 LDZ2 LTH2 ,&draw3 JCN
56
+		.Mouse/x DEI2 .r3/x2 LDZ2 GTH2 ,&draw3 JCN
57
+			.Mouse/y DEI2 .r3/y1 LDZ2 LTH2 ,&draw3 JCN
58
+				.Mouse/y DEI2 .r3/y2 LDZ2 GTH2 ,&draw3 JCN
59
+					#02 .color STZ ;hand_icn .pointer/sprite STZ2
60
+	&draw3 .r3/x1 LDZ2 .r3/y1 LDZ2 .r3/x2 LDZ2 .r3/y2 LDZ2 .color LDZ ;line-rect JSR2
61 61
 
62 62
 	;draw-cursor JSR2
63 63
 
... ...
@@ -67,35 +67,35 @@ BRK
67 67
 
68 68
 	( clear last cursor )
69 69
 	;clear_icn .Screen/addr DEO2
70
-	.pointer/x PEK2 .Screen/x DEO2
71
-	.pointer/y PEK2 .Screen/y DEO2
70
+	.pointer/x LDZ2 .Screen/x DEO2
71
+	.pointer/y LDZ2 .Screen/y DEO2
72 72
 	#30 .Screen/color DEO
73 73
 
74 74
 	( record pointer positions )
75
-	.Mouse/x DEI2 .pointer/x POK2 .Mouse/y DEI2 .pointer/y POK2
75
+	.Mouse/x DEI2 .pointer/x STZ2 .Mouse/y DEI2 .pointer/y STZ2
76 76
 
77 77
 	( draw new cursor )
78
-	.pointer/sprite PEK2 .Screen/addr DEO2
79
-	.pointer/x PEK2 .Screen/x DEO2
80
-	.pointer/y PEK2 .Screen/y DEO2
78
+	.pointer/sprite LDZ2 .Screen/addr DEO2
79
+	.pointer/x LDZ2 .Screen/x DEO2
80
+	.pointer/y LDZ2 .Screen/y DEO2
81 81
 	#31 .Screen/color DEO
82 82
 
83 83
 RTN
84 84
 
85 85
 @line-rect ( x1* y1* x2* y2* color -- )
86 86
 
87
-	( load ) .color POK .rect/y2 POK2 .rect/x2 POK2 DUP2 .Screen/y DEO2 .rect/y1 POK2 DUP2 .Screen/x DEO2 .rect/x1 POK2
87
+	( load ) .color STZ .rect/y2 STZ2 .rect/x2 STZ2 DUP2 .Screen/y DEO2 .rect/y1 STZ2 DUP2 .Screen/x DEO2 .rect/x1 STZ2
88 88
 	&hor
89 89
 		( incr ) .Screen/x DEI2 #0001 ADD2 .Screen/x DEO2
90
-		( draw ) .rect/y1 PEK2 .Screen/y DEO2 .color PEK .Screen/color DEO
91
-		( draw ) .rect/y2 PEK2 .Screen/y DEO2 .color PEK .Screen/color DEO
92
-		.Screen/x DEI2 .rect/x2 PEK2 LTH2 ,&hor JCN
93
-	.rect/y1 PEK2 .Screen/y DEO2
90
+		( draw ) .rect/y1 LDZ2 .Screen/y DEO2 .color LDZ .Screen/color DEO
91
+		( draw ) .rect/y2 LDZ2 .Screen/y DEO2 .color LDZ .Screen/color DEO
92
+		.Screen/x DEI2 .rect/x2 LDZ2 LTH2 ,&hor JCN
93
+	.rect/y1 LDZ2 .Screen/y DEO2
94 94
 	&ver
95
-		( draw ) .rect/x1 PEK2 .Screen/x DEO2 .color PEK .Screen/color DEO
96
-		( draw ) .rect/x2 PEK2 .Screen/x DEO2 .color PEK .Screen/color DEO
95
+		( draw ) .rect/x1 LDZ2 .Screen/x DEO2 .color LDZ .Screen/color DEO
96
+		( draw ) .rect/x2 LDZ2 .Screen/x DEO2 .color LDZ .Screen/color DEO
97 97
 		( incr ) .Screen/y DEI2 #0001 ADD2 .Screen/y DEO2
98
-		.Screen/y DEI2 .rect/y2 PEK2 #0001 ADD2 LTH2 ,&ver JCN
98
+		.Screen/y DEI2 .rect/y2 LDZ2 #0001 ADD2 LTH2 ,&ver JCN
99 99
 
100 100
 RTN
101 101
 
... ...
@@ -27,30 +27,30 @@ BRK
27 27
 @draw ( -- )
28 28
 	
29 29
 	( find screen center )
30
-	.Screen/width DEI2 #0002 DIV2 .center/x POK2
31
-	.Screen/height DEI2 #0002 DIV2 .center/y POK2
30
+	.Screen/width DEI2 #0002 DIV2 .center/x STZ2
31
+	.Screen/height DEI2 #0002 DIV2 .center/y STZ2
32 32
 
33 33
 	( draw ver line )
34
-	.center/x PEK2 .Screen/x DEO2 #0000 .Screen/y DEO2
34
+	.center/x LDZ2 .Screen/x DEO2 #0000 .Screen/y DEO2
35 35
 	&draw-ver
36 36
 		( draw ) #02 .Screen/color DEO
37 37
 		( incr ) .Screen/y DEI2 #0002 ADD2 .Screen/y DEO2
38 38
 		.Screen/y DEI2 .Screen/height DEI2 LTH2 ,&draw-ver JCN
39 39
 
40
-	.center/x PEK2 .center/y PEK2 #0010 SUB2 #2c ;text1 ;draw-label-left JSR2
41
-	.center/x PEK2 .center/y PEK2 #2c ;text2 ;draw-label-middle JSR2
42
-	.center/x PEK2 .center/y PEK2 #0010 ADD2 #2c ;text3 ;draw-label-right JSR2
43
-	.center/x PEK2 .center/y PEK2 #0020 ADD2 #2c ;text4 ;draw-label-middle JSR2
44
-	.center/x PEK2 .center/y PEK2 #0030 ADD2 #2c ;text5 ;draw-label-middle JSR2
40
+	.center/x LDZ2 .center/y LDZ2 #0010 SUB2 #2c ;text1 ;draw-label-left JSR2
41
+	.center/x LDZ2 .center/y LDZ2 #2c ;text2 ;draw-label-middle JSR2
42
+	.center/x LDZ2 .center/y LDZ2 #0010 ADD2 #2c ;text3 ;draw-label-right JSR2
43
+	.center/x LDZ2 .center/y LDZ2 #0020 ADD2 #2c ;text4 ;draw-label-middle JSR2
44
+	.center/x LDZ2 .center/y LDZ2 #0030 ADD2 #2c ;text5 ;draw-label-middle JSR2
45 45
 
46 46
 RTN
47 47
 
48 48
 @draw-label-left ( x y color addr -- )
49 49
 	
50
-	( load ) .label/addr POK2 .label/color POK .Screen/y DEO2 .Screen/x DEO2
51
-	.label/addr PEK2
50
+	( load ) .label/addr STZ2 .label/color STZ .Screen/y DEO2 .Screen/x DEO2
51
+	.label/addr LDZ2
52 52
 	&loop
53
-		( draw ) DUP2 LDA #00 SWP #0008 MUL2 ;font ADD2 .Screen/addr DEO2 .label/color PEK .Screen/color DEO
53
+		( draw ) DUP2 LDA #00 SWP #0008 MUL2 ;font ADD2 .Screen/addr DEO2 .label/color LDZ .Screen/color DEO
54 54
 		( incr ) #0001 ADD2
55 55
 		( incr ) .Screen/x DEI2 #0008 ADD2 .Screen/x DEO2
56 56
 		DUP2 LDA #00 NEQ ,&loop JCN
... ...
@@ -60,11 +60,11 @@ RTN
60 60
 
61 61
 @draw-label-middle ( x y color addr -- )
62 62
 	
63
-	( load ) .label/addr POK2 .label/color POK .Screen/y DEO2
64
-	( align ) .label/addr PEK2 ;get-text-length JSR2 #0008 MUL2 #0002 DIV2 SUB2 .Screen/x DEO2
65
-	.label/addr PEK2
63
+	( load ) .label/addr STZ2 .label/color STZ .Screen/y DEO2
64
+	( align ) .label/addr LDZ2 ;get-text-length JSR2 #0008 MUL2 #0002 DIV2 SUB2 .Screen/x DEO2
65
+	.label/addr LDZ2
66 66
 	&loop
67
-		( draw ) DUP2 LDA #00 SWP #0008 MUL2 ;font ADD2 .Screen/addr DEO2 .label/color PEK .Screen/color DEO
67
+		( draw ) DUP2 LDA #00 SWP #0008 MUL2 ;font ADD2 .Screen/addr DEO2 .label/color LDZ .Screen/color DEO
68 68
 		( incr ) #0001 ADD2
69 69
 		( incr ) .Screen/x DEI2 #0008 ADD2 .Screen/x DEO2
70 70
 		DUP2 LDA #00 NEQ ,&loop JCN
... ...
@@ -74,11 +74,11 @@ RTN
74 74
 
75 75
 @draw-label-right ( x y color addr -- )
76 76
 	
77
-	( load ) .label/addr POK2 .label/color POK .Screen/y DEO2
78
-	( align ) .label/addr PEK2 ;get-text-length JSR2 #0008 MUL2 SUB2 #0008 SUB2 .Screen/x DEO2
79
-	.label/addr PEK2
77
+	( load ) .label/addr STZ2 .label/color STZ .Screen/y DEO2
78
+	( align ) .label/addr LDZ2 ;get-text-length JSR2 #0008 MUL2 SUB2 #0008 SUB2 .Screen/x DEO2
79
+	.label/addr LDZ2
80 80
 	&loop
81
-		( draw ) DUP2 LDA #00 SWP #0008 MUL2 ;font ADD2 .Screen/addr DEO2 .label/color PEK .Screen/color DEO
81
+		( draw ) DUP2 LDA #00 SWP #0008 MUL2 ;font ADD2 .Screen/addr DEO2 .label/color LDZ .Screen/color DEO
82 82
 		( incr ) #0001 ADD2
83 83
 		( incr ) .Screen/x DEI2 #0008 ADD2 .Screen/x DEO2
84 84
 		DUP2 LDA #00 NEQ ,&loop JCN
... ...
@@ -42,14 +42,14 @@ BRK
42 42
 
43 43
 @draw-icn ( x y width height color addr -- )
44 44
 	
45
-	( load ) .Screen/addr DEO2 .color POK .size/height POK2 .size/width POK2 .position/y POK2 .position/x POK2
46
-	#0000 .size/height PEK2
45
+	( load ) .Screen/addr DEO2 .color STZ .size/height STZ2 .size/width STZ2 .position/y STZ2 .position/x STZ2
46
+	#0000 .size/height LDZ2
47 47
 	&ver
48
-		( save ) OVR2 .position/y PEK2 ADD2 .Screen/y DEO2
49
-		#0000 .size/width PEK2
48
+		( save ) OVR2 .position/y LDZ2 ADD2 .Screen/y DEO2
49
+		#0000 .size/width LDZ2
50 50
 		&hor
51
-			( save ) OVR2 .position/x PEK2 ADD2 .Screen/x DEO2
52
-			( draw ) .color PEK .Screen/color DEO
51
+			( save ) OVR2 .position/x LDZ2 ADD2 .Screen/x DEO2
52
+			( draw ) .color LDZ .Screen/color DEO
53 53
 			( incr ) .Screen/addr DEI2 8+ .Screen/addr DEO2
54 54
 			( incr ) SWP2 8+ SWP2
55 55
 			OVR2 OVR2 LTH2 ,&hor JCN
... ...
@@ -62,14 +62,14 @@ RTN
62 62
 
63 63
 @draw-chr ( x y width height color addr -- )
64 64
 	
65
-	( load ) .Screen/addr DEO2 .color POK .size/height POK2 .size/width POK2 .position/y POK2 .position/x POK2
66
-	#0000 .size/height PEK2
65
+	( load ) .Screen/addr DEO2 .color STZ .size/height STZ2 .size/width STZ2 .position/y STZ2 .position/x STZ2
66
+	#0000 .size/height LDZ2
67 67
 	&ver
68
-		( save ) OVR2 .position/y PEK2 ADD2 .Screen/y DEO2
69
-		#0000 .size/width PEK2
68
+		( save ) OVR2 .position/y LDZ2 ADD2 .Screen/y DEO2
69
+		#0000 .size/width LDZ2
70 70
 		&hor
71
-			( save ) OVR2 .position/x PEK2 ADD2 .Screen/x DEO2
72
-			( draw ) .color PEK .Screen/color DEO
71
+			( save ) OVR2 .position/x LDZ2 ADD2 .Screen/x DEO2
72
+			( draw ) .color LDZ .Screen/color DEO
73 73
 			( incr ) .Screen/addr DEI2 #0010 ADD2 .Screen/addr DEO2
74 74
 			( incr ) SWP2 8+ SWP2
75 75
 			OVR2 OVR2 LTH2 ,&hor JCN
... ...
@@ -82,14 +82,14 @@ RTN
82 82
 
83 83
 @cover-pattern ( addr color -- )
84 84
 	
85
-	( load ) .color POK .Screen/addr DEO2
85
+	( load ) .color STZ .Screen/addr DEO2
86 86
 	#0000 .Screen/height DEI2
87 87
 	&ver
88 88
 		( save ) OVR2 .Screen/y DEO2
89 89
 		#0000 .Screen/width DEI2
90 90
 		&hor
91 91
 			( save ) OVR2 .Screen/x DEO2
92
-			( draw ) .color PEK .Screen/color DEO
92
+			( draw ) .color LDZ .Screen/color DEO
93 93
 			( incr ) SWP2 8+ SWP2
94 94
 			OVR2 OVR2 LTH2 ,&hor JCN
95 95
 		POP2 POP2
... ...
@@ -46,23 +46,23 @@ BRK
46 46
 
47 47
 @line-slow ( x1 y1 x2 y2 color -- )
48 48
 	
49
-	( load ) .color POK -- .line/y0 POK2 -- .line/x0 POK2 .line/y POK2 .line/x POK2
50
-	.line/x0 PEK2 .line/x PEK2 SUB2 ABS2 .line/dx POK2
51
-	.line/y0 PEK2 .line/y PEK2 SUB2 ABS2 #0000 SWP2 SUB2 .line/dy POK2
52
-	#ffff #00 .line/x PEK2 .line/x0 PEK2 LTS2 #0002 MUL2 ADD2 .line/sx POK2
53
-	#ffff #00 .line/y PEK2 .line/y0 PEK2 LTS2 #0002 MUL2 ADD2 .line/sy POK2
54
-	.line/dx PEK2 .line/dy PEK2 ADD2 .line/e1 POK2
49
+	( load ) .color STZ -- .line/y0 STZ2 -- .line/x0 STZ2 .line/y STZ2 .line/x STZ2
50
+	.line/x0 LDZ2 .line/x LDZ2 SUB2 ABS2 .line/dx STZ2
51
+	.line/y0 LDZ2 .line/y LDZ2 SUB2 ABS2 #0000 SWP2 SUB2 .line/dy STZ2
52
+	#ffff #00 .line/x LDZ2 .line/x0 LDZ2 LTS2 #0002 MUL2 ADD2 .line/sx STZ2
53
+	#ffff #00 .line/y LDZ2 .line/y0 LDZ2 LTS2 #0002 MUL2 ADD2 .line/sy STZ2
54
+	.line/dx LDZ2 .line/dy LDZ2 ADD2 .line/e1 STZ2
55 55
 	&loop
56
-		.line/x PEK2 .Screen/x DEO2 .line/y PEK2 .Screen/y DEO2 .color PEK .Screen/color DEO
57
-		.line/x PEK2 .line/x0 PEK2 EQU2 .line/y PEK2 .line/y0 PEK2 EQU2 #0101 EQU2 ,&end JCN
58
-		.line/e1 PEK2 #0002 MUL2 .line/e2 POK2
59
-		.line/e2 PEK2 .line/dy PEK2 LTS2 ,&skipy JCN
60
-			.line/e1 PEK2 .line/dy PEK2 ADD2 .line/e1 POK2
61
-			.line/x PEK2 .line/sx PEK2 ADD2 .line/x POK2
56
+		.line/x LDZ2 .Screen/x DEO2 .line/y LDZ2 .Screen/y DEO2 .color LDZ .Screen/color DEO
57
+		.line/x LDZ2 .line/x0 LDZ2 EQU2 .line/y LDZ2 .line/y0 LDZ2 EQU2 #0101 EQU2 ,&end JCN
58
+		.line/e1 LDZ2 #0002 MUL2 .line/e2 STZ2
59
+		.line/e2 LDZ2 .line/dy LDZ2 LTS2 ,&skipy JCN
60
+			.line/e1 LDZ2 .line/dy LDZ2 ADD2 .line/e1 STZ2
61
+			.line/x LDZ2 .line/sx LDZ2 ADD2 .line/x STZ2
62 62
 		&skipy
63
-		.line/e2 PEK2 .line/dx PEK2 GTS2 ,&skipx JCN
64
-			.line/e1 PEK2 .line/dx PEK2 ADD2 .line/e1 POK2
65
-			.line/y PEK2 .line/sy PEK2 ADD2 .line/y POK2
63
+		.line/e2 LDZ2 .line/dx LDZ2 GTS2 ,&skipx JCN
64
+			.line/e1 LDZ2 .line/dx LDZ2 ADD2 .line/e1 STZ2
65
+			.line/y LDZ2 .line/sy LDZ2 ADD2 .line/y STZ2
66 66
 		&skipx
67 67
 		;&loop JMP2
68 68
 
... ...
@@ -72,20 +72,20 @@ RTN
72 72
 
73 73
 @line-rect ( x1 y1 x2 y2 color -- )
74 74
 
75
-	( load ) .color POK DUP2 STH2 -- .rect/y2 POK2 -- .rect/x2 POK2 DUP2 STH2 .rect/y1 POK2 .rect/x1 POK2
75
+	( load ) .color STZ DUP2 STH2 -- .rect/y2 STZ2 -- .rect/x2 STZ2 DUP2 STH2 .rect/y1 STZ2 .rect/x1 STZ2
76 76
 	STH2r STH2r
77 77
 	&ver
78 78
 		( save ) OVR2 .Screen/y DEO2
79
-		( draw ) .rect/x1 PEK2 .Screen/x DEO2 .color PEK DUP .Screen/color DEO
80
-		( draw ) .rect/x2 PEK2 .Screen/x DEO2 .Screen/color DEO
79
+		( draw ) .rect/x1 LDZ2 .Screen/x DEO2 .color LDZ DUP .Screen/color DEO
80
+		( draw ) .rect/x2 LDZ2 .Screen/x DEO2 .Screen/color DEO
81 81
 		( incr ) SWP2 ++ SWP2
82 82
 		OVR2 OVR2 LTS2 ,&ver JCN
83 83
 	POP2 POP2
84
-	.rect/x1 PEK2 .rect/x2 PEK2
84
+	.rect/x1 LDZ2 .rect/x2 LDZ2
85 85
 	&hor
86 86
 		( save ) OVR2 .Screen/x DEO2
87
-		( draw ) .rect/y1 PEK2 .Screen/y DEO2 .color PEK DUP .Screen/color DEO
88
-		( draw ) .rect/y2 PEK2 .Screen/y DEO2 .Screen/color DEO
87
+		( draw ) .rect/y1 LDZ2 .Screen/y DEO2 .color LDZ DUP .Screen/color DEO
88
+		( draw ) .rect/y2 LDZ2 .Screen/y DEO2 .Screen/color DEO
89 89
 		( incr ) SWP2 ++ SWP2
90 90
 		OVR2 OVR2 ++ LTS2 ,&hor JCN
91 91
 	POP2 POP2
... ...
@@ -94,14 +94,14 @@ RTN
94 94
 
95 95
 @fill-rect ( x1 y1 x2 y2 color -- )
96 96
 	
97
-	.color POK
97
+	.color STZ
98 98
 	( x1 x2 y1 y2 ) ROT2 SWP2
99 99
 	&ver
100 100
 		( save ) OVR2 .Screen/y DEO2
101 101
 		STH2 STH2 OVR2 OVR2
102 102
 		&hor
103 103
 			( save ) OVR2 .Screen/x DEO2
104
-			( draw ) .color PEK .Screen/color DEO
104
+			( draw ) .color LDZ .Screen/color DEO
105 105
 			( incr ) SWP2 ++ SWP2
106 106
 			OVR2 OVR2 LTS2 ,&hor JCN
107 107
 		POP2 POP2 STH2r STH2r
... ...
@@ -113,44 +113,44 @@ RTN
113 113
 
114 114
 @draw-circle ( xc yc r color -- )
115 115
 
116
-	( load ) .color POK .circle/r POK2 .circle/yc POK2 .circle/xc POK2
117
-	#0000 .circle/x POK2 .circle/r PEK2 .circle/y POK2
118
-	.circle/r PEK2 #0002 MUL2 .circle/d POK2
116
+	( load ) .color STZ .circle/r STZ2 .circle/yc STZ2 .circle/xc STZ2
117
+	#0000 .circle/x STZ2 .circle/r LDZ2 .circle/y STZ2
118
+	.circle/r LDZ2 #0002 MUL2 .circle/d STZ2
119 119
 	( draw ) ;&seg JSR2
120 120
 	&loop
121
-		( incr ) .circle/x PEK2 ++ .circle/x POK2
122
-		.circle/d PEK2 #0001 LTS2 ,&else JCN
123
-			( decr ) .circle/y PEK2 -- .circle/y POK2
124
-			.circle/x PEK2 .circle/y PEK2 SUB2 #0004 MUL2 .circle/d PEK2 ADD2 .circle/d POK2
121
+		( incr ) .circle/x LDZ2 ++ .circle/x STZ2
122
+		.circle/d LDZ2 #0001 LTS2 ,&else JCN
123
+			( decr ) .circle/y LDZ2 -- .circle/y STZ2
124
+			.circle/x LDZ2 .circle/y LDZ2 SUB2 #0004 MUL2 .circle/d LDZ2 ADD2 .circle/d STZ2
125 125
 			;&end JMP2
126 126
 		&else
127
-			.circle/x PEK2 #0004 MUL2 .circle/d PEK2 ADD2 .circle/d POK2
127
+			.circle/x LDZ2 #0004 MUL2 .circle/d LDZ2 ADD2 .circle/d STZ2
128 128
 		&end
129 129
 		( draw ) ;&seg JSR2
130
-		.circle/y PEK2 .circle/x PEK2 -- GTS2 ,&loop JCN
130
+		.circle/y LDZ2 .circle/x LDZ2 -- GTS2 ,&loop JCN
131 131
 	RTN
132 132
 	&seg
133
-		.circle/xc PEK2 .circle/x PEK2 ADD2 .Screen/x DEO2 .circle/yc PEK2 .circle/y PEK2 ADD2 .Screen/y DEO2 .color PEK .Screen/color DEO
134
-		.circle/xc PEK2 .circle/x PEK2 SUB2 .Screen/x DEO2 .circle/yc PEK2 .circle/y PEK2 ADD2 .Screen/y DEO2 .color PEK .Screen/color DEO
135
-		.circle/xc PEK2 .circle/x PEK2 ADD2 .Screen/x DEO2 .circle/yc PEK2 .circle/y PEK2 SUB2 .Screen/y DEO2 .color PEK .Screen/color DEO
136
-		.circle/xc PEK2 .circle/x PEK2 SUB2 .Screen/x DEO2 .circle/yc PEK2 .circle/y PEK2 SUB2 .Screen/y DEO2 .color PEK .Screen/color DEO
137
-		.circle/xc PEK2 .circle/y PEK2 ADD2 .Screen/x DEO2 .circle/yc PEK2 .circle/x PEK2 ADD2 .Screen/y DEO2 .color PEK .Screen/color DEO
138
-		.circle/xc PEK2 .circle/y PEK2 SUB2 .Screen/x DEO2 .circle/yc PEK2 .circle/x PEK2 ADD2 .Screen/y DEO2 .color PEK .Screen/color DEO
139
-		.circle/xc PEK2 .circle/y PEK2 ADD2 .Screen/x DEO2 .circle/yc PEK2 .circle/x PEK2 SUB2 .Screen/y DEO2 .color PEK .Screen/color DEO
140
-		.circle/xc PEK2 .circle/y PEK2 SUB2 .Screen/x DEO2 .circle/yc PEK2 .circle/x PEK2 SUB2 .Screen/y DEO2 .color PEK .Screen/color DEO
133
+		.circle/xc LDZ2 .circle/x LDZ2 ADD2 .Screen/x DEO2 .circle/yc LDZ2 .circle/y LDZ2 ADD2 .Screen/y DEO2 .color LDZ .Screen/color DEO
134
+		.circle/xc LDZ2 .circle/x LDZ2 SUB2 .Screen/x DEO2 .circle/yc LDZ2 .circle/y LDZ2 ADD2 .Screen/y DEO2 .color LDZ .Screen/color DEO
135
+		.circle/xc LDZ2 .circle/x LDZ2 ADD2 .Screen/x DEO2 .circle/yc LDZ2 .circle/y LDZ2 SUB2 .Screen/y DEO2 .color LDZ .Screen/color DEO
136
+		.circle/xc LDZ2 .circle/x LDZ2 SUB2 .Screen/x DEO2 .circle/yc LDZ2 .circle/y LDZ2 SUB2 .Screen/y DEO2 .color LDZ .Screen/color DEO
137
+		.circle/xc LDZ2 .circle/y LDZ2 ADD2 .Screen/x DEO2 .circle/yc LDZ2 .circle/x LDZ2 ADD2 .Screen/y DEO2 .color LDZ .Screen/color DEO
138
+		.circle/xc LDZ2 .circle/y LDZ2 SUB2 .Screen/x DEO2 .circle/yc LDZ2 .circle/x LDZ2 ADD2 .Screen/y DEO2 .color LDZ .Screen/color DEO
139
+		.circle/xc LDZ2 .circle/y LDZ2 ADD2 .Screen/x DEO2 .circle/yc LDZ2 .circle/x LDZ2 SUB2 .Screen/y DEO2 .color LDZ .Screen/color DEO
140
+		.circle/xc LDZ2 .circle/y LDZ2 SUB2 .Screen/x DEO2 .circle/yc LDZ2 .circle/x LDZ2 SUB2 .Screen/y DEO2 .color LDZ .Screen/color DEO
141 141
 
142 142
 RTN
143 143
 
144 144
 @cover-pattern ( addr color -- )
145 145
 	
146
-	( load ) .color POK .Screen/addr DEO2
146
+	( load ) .color STZ .Screen/addr DEO2
147 147
 	#0000 .Screen/height DEI2
148 148
 	&ver
149 149
 		( save ) OVR2 .Screen/y DEO2
150 150
 		#0000 .Screen/width DEI2
151 151
 		&hor
152 152
 			( save ) OVR2 .Screen/x DEO2
153
-			( draw ) .color PEK .Screen/color DEO
153
+			( draw ) .color LDZ .Screen/color DEO
154 154
 			( incr ) SWP2 8+ SWP2
155 155
 			OVR2 OVR2 LTH2 ,&hor JCN
156 156
 		POP2 POP2
... ...
@@ -11,10 +11,10 @@
11 11
 
12 12
 |0100 ( -> )
13 13
 	#90ff .System/r DEO2 #9000 .System/g DEO2 #900f .System/b DEO2
14
-	#08e0 .Screen/width DEI2 #0001 SFT2 SUB2 .scroll/x POK2
15
-	#09b0 .scroll/y POK2
14
+	#08e0 .Screen/width DEI2 #0001 SFT2 SUB2 .scroll/x STZ2
15
+	#09b0 .scroll/y STZ2
16 16
 	;frame .Screen/vector DEO2
17
-	#30 .scroll/wait POK
17
+	#30 .scroll/wait STZ
18 18
 	BRK
19 19
 
20 20
 @frame ( -> )
... ...
@@ -24,22 +24,22 @@
24 24
 	#0001 ADD2
25 25
 	DUP2 .Screen/height DEI2 LTH2 ,&loop JCN
26 26
 	POP2
27
-	.scroll/wait PEK ,&noscroll JCN
28
-	.scroll/y PEK2 #0001 ADD2 .scroll/y POK2
27
+	.scroll/wait LDZ ,&noscroll JCN
28
+	.scroll/y LDZ2 #0001 ADD2 .scroll/y STZ2
29 29
 	BRK
30 30
 
31 31
 	&noscroll
32
-	.scroll/wait PEK #01 SUB .scroll/wait POK
32
+	.scroll/wait LDZ #01 SUB .scroll/wait STZ
33 33
 	BRK
34 34
 
35 35
 @row ( y* -- )
36 36
 	DUP2 .Screen/y DEO2
37
-	.scroll/y PEK2 ADD2
37
+	.scroll/y LDZ2 ADD2
38 38
 
39 39
 	.Screen/width DEI2
40 40
 	&loop
41 41
 	#0001 SUB2
42
-	OVR2 OVR2 .scroll/x PEK2 ADD2 EOR2 DUP2 #0013 DIV2 #0013 MUL2 SUB2
42
+	OVR2 OVR2 .scroll/x LDZ2 ADD2 EOR2 DUP2 #0013 DIV2 #0013 MUL2 SUB2
43 43
 	DUP #00 EQU ,&draw JCN
44 44
 	DUP #05 EQU ,&draw JCN
45 45
 	POP2
... ...
@@ -426,7 +426,7 @@
426 426
 	;asma-parse-hex-string JSR2
427 427
 	,&valid JCN
428 428
 
429
-	;asma-msg-hex ;asma/error POK2
429
+	;asma-msg-hex ;asma/error STZ2
430 430
 	JMP2r
431 431
 
432 432
 	&valid
... ...
@@ -732,8 +732,8 @@
732 732
 	&JCN         $2         $2          "JCN 00
733 733
 	&JSR        :&JMP      :&LDR        "JSR 00
734 734
 	&STH        :&SFT      :&SUB        "STH 00
735
-	&PEK        :&OVR      :&POK        "PEK 00
736
-	&POK         $2         $2          "POK 00
735
+	&LDZ        :&OVR      :&STZ        "LDZ 00
736
+	&STZ         $2         $2          "STZ 00
737 737
 	&LDR        :&LDA      :&LIT        "LDR 00
738 738
 	&STR         $2         $2          "STR 00
739 739
 	&LDA         $2         $2          "LDA 00
... ...
@@ -745,7 +745,7 @@
745 745
 	&MUL         $2         $2          "MUL 00
746 746
 	&DIV         $2         $2          "DIV 00
747 747
 	&AND        :&ADD       $2          "AND 00
748
-	&ORA        :&NEQ      :&PEK        "ORA 00
748
+	&ORA        :&NEQ      :&LDZ        "ORA 00
749 749
 	&EOR         $2         $2          "EOR 00
750 750
 	&SFT        :&ROT      :&STA        "SFT 00
751 751
 
... ...
@@ -66,7 +66,7 @@
66 66
 	;filepath ;load-file JSR2
67 67
 
68 68
 	( place textarea )
69
-	#0018 .textarea/x1 POK2 .Screen/height DEI2 8- .textarea/y2 POK2
69
+	#0018 .textarea/x1 STZ2 .Screen/height DEI2 8- .textarea/y2 STZ2
70 70
 
71 71
 	;select JSR2
72 72
 	;redraw JSR2
... ...
@@ -79,13 +79,13 @@ BRK
79 79
 	.Controller/button DEI #0f AND #02 NEQ ,&no-alt JCN
80 80
 		.Controller/button DEI #04 SFT
81 81
 		DUP #01 NEQ ,&no-aup JCN
82
-			( sel word ) ;find-wordstart JSR2 .selection/to POK2 &no-aup
82
+			( sel word ) ;find-wordstart JSR2 .selection/to STZ2 &no-aup
83 83
 		DUP #02 NEQ ,&no-adown JCN
84
-			( sel word ) ;find-wordend JSR2 .selection/to POK2 &no-adown
84
+			( sel word ) ;find-wordend JSR2 .selection/to STZ2 &no-adown
85 85
 		DUP #04 NEQ ,&no-aleft JCN
86
-			( sel decr ) .selection/to PEK2 -- .selection/to POK2 &no-aleft
86
+			( sel decr ) .selection/to LDZ2 -- .selection/to STZ2 &no-aleft
87 87
 		DUP #08 NEQ ,&no-aright JCN
88
-			( sel incr ) .selection/to PEK2 ++ .selection/to POK2 &no-aright
88
+			( sel incr ) .selection/to LDZ2 ++ .selection/to STZ2 &no-aright
89 89
 		POP
90 90
 		;clamp-selection JSR2
91 91
 		;redraw JSR2
... ...
@@ -112,20 +112,20 @@ BRK
112 112
 	.Controller/button DEI #f0 AND #00 EQU ;&no-arrow JCN2
113 113
 		.Controller/button DEI #f0 AND
114 114
 		DUP #10 NEQ ,&no-arrowup JCN
115
-			( clamp ) .position/y PEK2 #0000 EQU2 ,&no-arrowup JCN
116
-			;find-lineoffset JSR2 .position/x POK2 .position/y PEK2 -- .position/y POK2
117
-			;find-selection JSR2 DUP2 .selection/from POK2 ++ .selection/to POK2 &no-arrowup
115
+			( clamp ) .position/y LDZ2 #0000 EQU2 ,&no-arrowup JCN
116
+			;find-lineoffset JSR2 .position/x STZ2 .position/y LDZ2 -- .position/y STZ2
117
+			;find-selection JSR2 DUP2 .selection/from STZ2 ++ .selection/to STZ2 &no-arrowup
118 118
 		DUP #20 NEQ ,&no-arrowdown JCN
119 119
 			( clamp:TODO )
120
-			;find-lineoffset JSR2 .position/x POK2 .position/y PEK2 ++ .position/y POK2
121
-			;find-selection JSR2 DUP2 .selection/from POK2 ++ .selection/to POK2 &no-arrowdown
120
+			;find-lineoffset JSR2 .position/x STZ2 .position/y LDZ2 ++ .position/y STZ2
121
+			;find-selection JSR2 DUP2 .selection/from STZ2 ++ .selection/to STZ2 &no-arrowdown
122 122
 		DUP #40 NEQ ,&no-arrowleft JCN
123
-			( clamp ) .selection/from PEK2 ;document/body EQU2 ,&no-arrowleft JCN
124
-			.selection/from PEK2 -- DUP2 .selection/from POK2 ++ .selection/to POK2 &no-arrowleft
123
+			( clamp ) .selection/from LDZ2 ;document/body EQU2 ,&no-arrowleft JCN
124
+			.selection/from LDZ2 -- DUP2 .selection/from STZ2 ++ .selection/to STZ2 &no-arrowleft
125 125
 		DUP #80 NEQ ,&no-arrowright JCN
126 126
 			( clamp:TODO )
127 127
 			#aa .Console/byte DEO
128
-			.selection/from PEK2 ++ DUP2 .selection/from POK2 ++ .selection/to POK2 &no-arrowright
128
+			.selection/from LDZ2 ++ DUP2 .selection/from STZ2 ++ .selection/to STZ2 &no-arrowright
129 129
 		POP
130 130
 		;clamp-selection JSR2
131 131
 		;follow-selection JSR2
... ...
@@ -134,24 +134,24 @@ BRK
134 134
 
135 135
 	.Controller/key DEI #08 NEQ ,&no-backspace JCN
136 136
 		( erase )
137
-		.selection/to PEK2 .selection/from PEK2 SUB2 #0001 NEQ2 ,&erase-multiple JCN
138
-			.selection/to PEK2 .selection/from PEK2 SUB2 ;shift-left JSR2
137
+		.selection/to LDZ2 .selection/from LDZ2 SUB2 #0001 NEQ2 ,&erase-multiple JCN
138
+			.selection/to LDZ2 .selection/from LDZ2 SUB2 ;shift-left JSR2
139 139
 			;&erase-end JMP2
140 140
 		&erase-multiple
141
-			.selection/from PEK2 ++ .selection/from POK2
142
-			.selection/to PEK2 .selection/from PEK2 SUB2 ++ ;shift-left JSR2
141
+			.selection/from LDZ2 ++ .selection/from STZ2
142
+			.selection/to LDZ2 .selection/from LDZ2 SUB2 ++ ;shift-left JSR2
143 143
 		&erase-end
144
-		.selection/from PEK2 -- .selection/from POK2
145
-		.selection/from PEK2 ++ .selection/to POK2
144
+		.selection/from LDZ2 -- .selection/from STZ2
145
+		.selection/from LDZ2 ++ .selection/to STZ2
146 146
 		;redraw JSR2
147 147
 		BRK
148 148
 	&no-backspace
149 149
 
150 150
 	( insert )
151
-	.selection/to PEK2 .selection/from PEK2 SUB2 ;shift-right JSR2
152
-	.Controller/key DEI .selection/from PEK2 STA
153
-	.selection/from PEK2 ++ .selection/from POK2
154
-	.selection/from PEK2 ++ .selection/to POK2
151
+	.selection/to LDZ2 .selection/from LDZ2 SUB2 ;shift-right JSR2
152
+	.Controller/key DEI .selection/from LDZ2 STA
153
+	.selection/from LDZ2 ++ .selection/from STZ2
154
+	.selection/from LDZ2 ++ .selection/to STZ2
155 155
 	;redraw JSR2
156 156
 
157 157
 BRK
... ...
@@ -164,7 +164,7 @@ BRK
164 164
 		;touch-scrollbar JMP2
165 165
 	&touch-end
166 166
 
167
-	.Mouse/state DEI .touch/state POK
167
+	.Mouse/state DEI .touch/state STZ
168 168
 
169 169
 	;draw-cursor JSR2
170 170
 
... ...
@@ -172,9 +172,9 @@ BRK
172 172
 
173 173
 @touch-linebar ( -- )
174 174
 	
175
-	#0000 .position/x POK2
176
-	.Mouse/y DEI2 8/ .scroll/y PEK2 ADD2 .position/y POK2
177
-	;find-selection JSR2 DUP2 .selection/from POK2 ++ .selection/to POK2
175
+	#0000 .position/x STZ2
176
+	.Mouse/y DEI2 8/ .scroll/y LDZ2 ADD2 .position/y STZ2
177
+	;find-selection JSR2 DUP2 .selection/from STZ2 ++ .selection/to STZ2
178 178
 	;goto-linestart JSR2
179 179
 	;redraw JSR2
180 180
 	;draw-cursor JSR2
... ...
@@ -183,8 +183,8 @@ BRK
183 183
 
184 184
 @touch-body ( -- )
185 185
 	
186
-	.Mouse/y DEI2 8/ .scroll/y PEK2 ADD2 .position/y POK2
187
-	.Mouse/x DEI2 .textarea/x1 PEK2 SUB2 #0007 ADD2 #0007 DIV2 .position/x POK2
186
+	.Mouse/y DEI2 8/ .scroll/y LDZ2 ADD2 .position/y STZ2
187
+	.Mouse/x DEI2 .textarea/x1 LDZ2 SUB2 #0007 ADD2 #0007 DIV2 .position/x STZ2
188 188
 	( chords )
189 189
 	.Mouse/chord DEI #00 EQU ,&no-chords JCN
190 190
 		.Mouse/chord DEI
... ...
@@ -197,16 +197,16 @@ BRK
197 197
 		BRK
198 198
 	&no-chords
199 199
 	( drag )
200
-	.Mouse/state DEI .touch/state PEK NEQ .Controller/button DEI #0f AND #02 NEQ #0101 EQU2 ,&no-drag JCN
200
+	.Mouse/state DEI .touch/state LDZ NEQ .Controller/button DEI #0f AND #02 NEQ #0101 EQU2 ,&no-drag JCN
201 201
 		( on drag )
202
-		;find-selection JSR2 ++ .selection/to POK2
202
+		;find-selection JSR2 ++ .selection/to STZ2
203 203
 		;clamp-selection JSR2
204 204
 		,&end JMP
205 205
 	&no-drag
206 206
 	( on click )
207
-	;find-selection JSR2 DUP2 .selection/from POK2 ++ .selection/to POK2
207
+	;find-selection JSR2 DUP2 .selection/from STZ2 ++ .selection/to STZ2
208 208
 	&end
209
-	.Mouse/state DEI .touch/state POK
209
+	.Mouse/state DEI .touch/state STZ
210 210
 	;draw-cursor JSR2
211 211
 	;redraw JSR2
212 212
 
... ...
@@ -215,16 +215,16 @@ BRK
215 215
 @touch-scrollbar ( -- )
216 216
 
217 217
 	.Mouse/y DEI2 #0008 GTH2 ,&no-up JCN
218
-		( decr ) .scroll/y PEK2 #00 .scroll/y PEK2 #0000 NEQ2 SUB2 .scroll/y POK2
218
+		( decr ) .scroll/y LDZ2 #00 .scroll/y LDZ2 #0000 NEQ2 SUB2 .scroll/y STZ2
219 219
 		,&end JMP
220 220
 	&no-up
221 221
 	.Mouse/y DEI2 .Screen/height DEI2 8- LTH2 ,&no-down JCN
222
-		( incr ) .scroll/y PEK2 ++ .scroll/y POK2
222
+		( incr ) .scroll/y LDZ2 ++ .scroll/y STZ2
223 223
 		,&end JMP
224 224
 	&no-down
225
-	.Mouse/y DEI2 8- .scroll/y POK2
225
+	.Mouse/y DEI2 8- .scroll/y STZ2
226 226
 	&end
227
-	.Mouse/state DEI .touch/state POK
227
+	.Mouse/state DEI .touch/state STZ
228 228
 	;draw-cursor JSR2
229 229
 	;redraw JSR2
230 230
 
... ...
@@ -243,205 +243,205 @@ RTN
243 243
 
244 244
 @scroll-up ( length -- )
245 245
 	
246
-	DUP2 .scroll/y PEK2 LTH2 ,&clamp JCN
247
-		#0000 .scroll/y POK2 POP2 RTN
246
+	DUP2 .scroll/y LDZ2 LTH2 ,&clamp JCN
247
+		#0000 .scroll/y STZ2 POP2 RTN
248 248
 	&clamp
249
-	.scroll/y PEK2 SWP2 SUB2 .scroll/y POK2
249
+	.scroll/y LDZ2 SWP2 SUB2 .scroll/y STZ2
250 250
 
251 251
 RTN
252 252
 
253 253
 @scroll-down ( length -- )
254 254
 
255 255
 	( TODO: Clamp )
256
-	.scroll/y PEK2 SWP2 ADD2 .scroll/y POK2
256
+	.scroll/y LDZ2 SWP2 ADD2 .scroll/y STZ2
257 257
 
258 258
 RTN
259 259
 
260 260
 @shift-left ( length -- )
261 261
 
262
-	.i POK2
263
-	.selection/from PEK2 -- .j POK2 ( start -> end )
262
+	.i STZ2
263
+	.selection/from LDZ2 -- .j STZ2 ( start -> end )
264 264
 	&loop
265
-		( move ) .j PEK2 .i PEK2 ADD2 LDA .j PEK2 STA
266
-		( incr ) .j PEK2 ++ .j POK2
267
-		.j PEK2 ;document/eof LDA2 LTH2 ,&loop JCN
268
-	;document/eof LDA2 .i PEK2 SUB2 ;document/eof STA2
265
+		( move ) .j LDZ2 .i LDZ2 ADD2 LDA .j LDZ2 STA
266
+		( incr ) .j LDZ2 ++ .j STZ2
267
+		.j LDZ2 ;document/eof LDA2 LTH2 ,&loop JCN
268
+	;document/eof LDA2 .i LDZ2 SUB2 ;document/eof STA2
269 269
 
270 270
 RTN
271 271
 
272 272
 @shift-right ( length -- )
273 273
 
274
-	.i POK2
275
-	;document/eof LDA2 .j POK2 ( end -> start )
274
+	.i STZ2
275
+	;document/eof LDA2 .j STZ2 ( end -> start )
276 276
 	&loop
277
-		( move ) .j PEK2 .i PEK2 SUB2 LDA .j PEK2 STA
278
-		( decr ) .j PEK2 -- .j POK2
279
-		.j PEK2 .selection/from PEK2 GTH2 ,&loop JCN
280
-	;document/eof LDA2 .i PEK2 ADD2 ;document/eof STA2
277
+		( move ) .j LDZ2 .i LDZ2 SUB2 LDA .j LDZ2 STA
278
+		( decr ) .j LDZ2 -- .j STZ2
279
+		.j LDZ2 .selection/from LDZ2 GTH2 ,&loop JCN
280
+	;document/eof LDA2 .i LDZ2 ADD2 ;document/eof STA2
281 281
 
282 282
 RTN
283 283
 
284 284
 @follow-selection ( -- )
285 285
 
286
-	.position/y PEK2 .scroll/y PEK2 GTH2 ,&no-up JCN
287
-		.position/y PEK2 .scroll/y POK2 RTN
286
+	.position/y LDZ2 .scroll/y LDZ2 GTH2 ,&no-up JCN
287
+		.position/y LDZ2 .scroll/y STZ2 RTN
288 288
 	&no-up
289
-	.position/y PEK2 .Screen/height DEI2 #0010 SUB2 8/ .scroll/y PEK2 ADD2 LTH2 ,&no-down JCN
290
-		.position/y PEK2 .Screen/height DEI2 #0010 SUB2 8/ SUB2 .scroll/y POK2 RTN
289
+	.position/y LDZ2 .Screen/height DEI2 #0010 SUB2 8/ .scroll/y LDZ2 ADD2 LTH2 ,&no-down JCN
290
+		.position/y LDZ2 .Screen/height DEI2 #0010 SUB2 8/ SUB2 .scroll/y STZ2 RTN
291 291
 	&no-down
292 292
 
293 293
 RTN
294 294
 
295 295
 @clamp-selection ( -- )
296 296
 
297
-	.selection/from PEK2 .selection/to PEK2 LTH2 RTN?
298
-	.selection/from PEK2 ++ .selection/to POK2
297
+	.selection/from LDZ2 .selection/to LDZ2 LTH2 RTN?
298
+	.selection/from LDZ2 ++ .selection/to STZ2
299 299
 
300 300
 RTN
301 301
 
302 302
 @goto-linestart ( -- )
303 303
 
304 304
 	&loop
305
-		.selection/from PEK2 -- LDA #0a EQU RTN?
306
-		.selection/from PEK2 -- LDA #0d EQU RTN?
307
-		( decr ) .selection/from PEK2 DUP2 .selection/to POK2 -- .selection/from POK2
308
-	.selection/from PEK2 LDA #00 NEQ ,&loop JCN
305
+		.selection/from LDZ2 -- LDA #0a EQU RTN?
306
+		.selection/from LDZ2 -- LDA #0d EQU RTN?
307
+		( decr ) .selection/from LDZ2 DUP2 .selection/to STZ2 -- .selection/from STZ2
308
+	.selection/from LDZ2 LDA #00 NEQ ,&loop JCN
309 309
 	( clamp at document body )
310
-	.selection/from PEK2 ;document/body GTH2 RTN?
311
-	;document/body DUP2 .selection/from POK2 ++ .selection/to POK2
310
+	.selection/from LDZ2 ;document/body GTH2 RTN?
311
+	;document/body DUP2 .selection/from STZ2 ++ .selection/to STZ2
312 312
 
313 313
 RTN
314 314
 
315 315
 @goto-lineend ( -- )
316 316
 	
317 317
 	&loop
318
-		.selection/from PEK2 LDA #0a EQU RTN?
319
-		.selection/from PEK2 LDA #0d EQU RTN?
320
-		( incr ) .selection/from PEK2 ++ DUP2 ++ .selection/to POK2 .selection/from POK2
321
-		.selection/from PEK2 LDA #00 NEQ ,&loop JCN
318
+		.selection/from LDZ2 LDA #0a EQU RTN?
319
+		.selection/from LDZ2 LDA #0d EQU RTN?
320
+		( incr ) .selection/from LDZ2 ++ DUP2 ++ .selection/to STZ2 .selection/from STZ2
321
+		.selection/from LDZ2 LDA #00 NEQ ,&loop JCN
322 322
 	( clamp at document body )
323
-	.selection/from PEK2 ;document/eof LTH2 RTN?
324
-	;document/eof -- DUP2 .selection/from POK2 ++ .selection/to POK2
323
+	.selection/from LDZ2 ;document/eof LTH2 RTN?
324
+	;document/eof -- DUP2 .selection/from STZ2 ++ .selection/to STZ2
325 325
 
326 326
 RTN
327 327
 
328 328
 @find-wordstart ( -- )
329 329
 
330
-	.selection/to PEK2 .j POK2
330
+	.selection/to LDZ2 .j STZ2
331 331
 	&loop
332
-		( decr ) .j PEK2 -- .j POK2
333
-		.j PEK2 LDA #20 EQU ,&end JCN
334
-		.j PEK2 LDA #0a EQU ,&end JCN
335
-		.j PEK2 LDA #0d EQU ,&end JCN
336
-		.j PEK2 ;document/body GTH2 ,&loop JCN
332
+		( decr ) .j LDZ2 -- .j STZ2
333
+		.j LDZ2 LDA #20 EQU ,&end JCN
334
+		.j LDZ2 LDA #0a EQU ,&end JCN
335
+		.j LDZ2 LDA #0d EQU ,&end JCN
336
+		.j LDZ2 ;document/body GTH2 ,&loop JCN
337 337
 	&end
338
-	( return ) .j PEK2 --
338
+	( return ) .j LDZ2 --
339 339
 
340 340
 RTN
341 341
 
342 342
 @find-wordend ( -- )
343 343
 	
344
-	.selection/to PEK2 .j POK2
344
+	.selection/to LDZ2 .j STZ2
345 345
 	&loop
346
-		( incr ) .j PEK2 ++ .j POK2
347
-		.j PEK2 LDA #20 EQU ,&end JCN
348
-		.j PEK2 LDA #0a EQU ,&end JCN
349
-		.j PEK2 LDA #0d EQU ,&end JCN
350
-		.j PEK2 ;document/body GTH2 ,&loop JCN
346
+		( incr ) .j LDZ2 ++ .j STZ2
347
+		.j LDZ2 LDA #20 EQU ,&end JCN
348
+		.j LDZ2 LDA #0a EQU ,&end JCN
349
+		.j LDZ2 LDA #0d EQU ,&end JCN
350
+		.j LDZ2 ;document/body GTH2 ,&loop JCN
351 351
 	&end
352
-	( return ) .j PEK2 ++
352
+	( return ) .j LDZ2 ++
353 353
 
354 354
 RTN
355 355
 
356 356
 @find-lineoffset ( return character offset from linestart )
357 357
 
358
-	#0000 .j POK2
358
+	#0000 .j STZ2
359 359
 	&loop
360
-		( incr ) .j PEK2 ++ .j POK2
361
-		.selection/from PEK2 .j PEK2 SUB2 LDA #0a EQU ,&end JCN
362
-		.selection/from PEK2 .j PEK2 SUB2 LDA #0d EQU ,&end JCN
363
-		.selection/from PEK2 .j PEK2 SUB2 ;document/body GTH2 ,&loop JCN
360
+		( incr ) .j LDZ2 ++ .j STZ2
361
+		.selection/from LDZ2 .j LDZ2 SUB2 LDA #0a EQU ,&end JCN
362
+		.selection/from LDZ2 .j LDZ2 SUB2 LDA #0d EQU ,&end JCN
363
+		.selection/from LDZ2 .j LDZ2 SUB2 ;document/body GTH2 ,&loop JCN
364 364
 	&end
365
-	( return ) .j PEK2
365
+	( return ) .j LDZ2
366 366
 
367 367
 RTN
368 368
 
369 369
 @find-line ( position -> addr )
370 370
 
371
-	;document/body .j POK2 #0000 .pt/y POK2
371
+	;document/body .j STZ2 #0000 .pt/y STZ2
372 372
 	&loop
373
-		.pt/y PEK2 .position/y PEK2 -- GTH2 ,&end JCN
374
-		.j PEK2 LDA #0a NEQ .j PEK2 LDA #0d NEQ #0101 EQU2 ,&no-space JCN
375
-			( incr ) .pt/y PEK2 ++ .pt/y POK2
373
+		.pt/y LDZ2 .position/y LDZ2 -- GTH2 ,&end JCN
374
+		.j LDZ2 LDA #0a NEQ .j LDZ2 LDA #0d NEQ #0101 EQU2 ,&no-space JCN
375
+			( incr ) .pt/y LDZ2 ++ .pt/y STZ2
376 376
 		&no-space
377
-		( incr ) .j PEK2 ++ .j POK2
378
-	.j PEK2 LDA #00 NEQ ,&loop JCN
377
+		( incr ) .j LDZ2 ++ .j STZ2
378
+	.j LDZ2 LDA #00 NEQ ,&loop JCN
379 379
 	&end
380
-	( return ) .j PEK2
380
+	( return ) .j LDZ2
381 381
 
382 382
 RTN
383 383
 
384 384
 @find-selection ( position -> addr )
385 385
 
386 386
 	;find-line JSR2 ( find line )
387
-	#0000 .pt/x POK2
387
+	#0000 .pt/x STZ2
388 388
 	&loop
389
-		.j PEK2 .pt/x PEK2 ADD2 LDA #0a EQU ,&end JCN
390
-		.j PEK2 .pt/x PEK2 ADD2 LDA #0d EQU ,&end JCN
391
-		( incr ) .pt/x PEK2 ++ .pt/x POK2
392
-		.pt/x PEK2 .position/x PEK2 -- LTH2 ,&loop JCN
389
+		.j LDZ2 .pt/x LDZ2 ADD2 LDA #0a EQU ,&end JCN
390
+		.j LDZ2 .pt/x LDZ2 ADD2 LDA #0d EQU ,&end JCN
391
+		( incr ) .pt/x LDZ2 ++ .pt/x STZ2
392
+		.pt/x LDZ2 .position/x LDZ2 -- LTH2 ,&loop JCN
393 393
 	&end
394
-	( return ) .pt/x PEK2 ADD2
394
+	( return ) .pt/x LDZ2 ADD2
395 395
 
396 396
 RTN
397 397
 
398 398
 @cut ( -- )
399 399
 
400 400
 	;copy JSR2
401
-	.selection/to PEK2 .selection/from PEK2 SUB2 ;shift-left JSR2
402
-	.selection/from PEK2 ++ .selection/to POK2
401
+	.selection/to LDZ2 .selection/from LDZ2 SUB2 ;shift-left JSR2
402
+	.selection/from LDZ2 ++ .selection/to STZ2
403 403
 
404 404
 RTN
405 405
 
406 406
 @copy ( -- )
407 407
 	
408
-	#0000 .i POK2 ( start )
409
-	.selection/to PEK2 .selection/from PEK2 SUB2 .j POK2 ( end )
410
-	.j PEK2 ;clip/len STA2
408
+	#0000 .i STZ2 ( start )
409
+	.selection/to LDZ2 .selection/from LDZ2 SUB2 .j STZ2 ( end )
410
+	.j LDZ2 ;clip/len STA2
411 411
 	&loop
412
-		.selection/from PEK2 .i PEK2 ADD2 LDA ;clip/body .i PEK2 ADD2 STA
413
-		( incr ) .i PEK2 ++ .i POK2
414
-		.i PEK2 .j PEK2 LTH2 ,&loop JCN
412
+		.selection/from LDZ2 .i LDZ2 ADD2 LDA ;clip/body .i LDZ2 ADD2 STA
413
+		( incr ) .i LDZ2 ++ .i STZ2
414
+		.i LDZ2 .j LDZ2 LTH2 ,&loop JCN
415 415
 
416 416
 RTN
417 417
 
418 418
 @paste ( -- )
419 419
 	
420 420
 	;clip/len LDA2 ;shift-right JSR2
421
-	#0000 .i POK2 ( start )
422
-	;clip/len LDA2 .j POK2 ( end )
421
+	#0000 .i STZ2 ( start )
422
+	;clip/len LDA2 .j STZ2 ( end )
423 423
 	&loop
424
-		;clip/body .i PEK2 ADD2 LDA .selection/from PEK2 .i PEK2 ADD2 STA
425
-		( incr ) .i PEK2 ++ .i POK2
426
-		.i PEK2 .j PEK2 LTH2 ,&loop JCN
424
+		;clip/body .i LDZ2 ADD2 LDA .selection/from LDZ2 .i LDZ2 ADD2 STA
425
+		( incr ) .i LDZ2 ++ .i STZ2
426
+		.i LDZ2 .j LDZ2 LTH2 ,&loop JCN
427 427
 
428 428
 RTN
429 429
 
430 430
 @select ( position -> selection )
431 431
 	
432
-	;document/body .selection/from POK2 #0000 .pt/x POK2 #0000 .pt/y POK2
432
+	;document/body .selection/from STZ2 #0000 .pt/x STZ2 #0000 .pt/y STZ2
433 433
 	&loop
434
-		.selection/from PEK2 LDA #0a NEQ .selection/from PEK2 LDA #0d NEQ #0101 EQU2 ,&no-space JCN
435
-			( incr ) .pt/y PEK2 ++ .pt/y POK2
436
-			#0000 .pt/x POK2
434
+		.selection/from LDZ2 LDA #0a NEQ .selection/from LDZ2 LDA #0d NEQ #0101 EQU2 ,&no-space JCN
435
+			( incr ) .pt/y LDZ2 ++ .pt/y STZ2
436
+			#0000 .pt/x STZ2
437 437
 		&no-space
438
-		.pt/y PEK2 .position/y PEK2 -- GTH2 .pt/x PEK2 .position/x PEK2 -- GTH2 #0101 NEQ2 ,&no-reached JCN
439
-			.selection/from PEK2 ++ .selection/to POK2
438
+		.pt/y LDZ2 .position/y LDZ2 -- GTH2 .pt/x LDZ2 .position/x LDZ2 -- GTH2 #0101 NEQ2 ,&no-reached JCN
439
+			.selection/from LDZ2 ++ .selection/to STZ2
440 440
 			RTN
441 441
 		&no-reached
442
-		( incr ) .pt/x PEK2 ++ .pt/x POK2
443
-		( incr ) .selection/from PEK2 ++ .selection/from POK2
444
-	.selection/from PEK2 LDA #00 NEQ ,&loop JCN
442
+		( incr ) .pt/x LDZ2 ++ .pt/x STZ2
443
+		( incr ) .selection/from LDZ2 ++ .selection/from STZ2
444
+	.selection/from LDZ2 LDA #00 NEQ ,&loop JCN
445 445
 
446 446
 RTN
447 447
 
... ...
@@ -476,7 +476,7 @@ RTN
476 476
 
477 477
 @draw-short ( short )
478 478
 
479
-	.addr POK2
479
+	.addr STZ2
480 480
 	;font_hex #00 ;addr LDA #f0 AND #04 SFT #08 MUL ADD2 .Screen/addr DEO2
481 481
 	( draw ) #2e .Screen/color DEO
482 482
 	.Screen/x DEI2 8+ .Screen/x DEO2
... ...
@@ -494,18 +494,18 @@ RTN
494 494
 @draw-cursor
495 495
 
496 496
 	( clear last cursor )
497
-	.mouse/x PEK2 .Screen/x DEO2
498
-	.mouse/y PEK2 .Screen/y DEO2
497
+	.mouse/x LDZ2 .Screen/x DEO2
498
+	.mouse/y LDZ2 .Screen/y DEO2
499 499
 	;blank_icn .Screen/addr DEO2
500 500
 	#30 .Screen/color DEO
501 501
 
502 502
 	( record mouse positions )
503
-	.Mouse/x DEI2 .mouse/x POK2
504
-	.Mouse/y DEI2 .mouse/y POK2
503
+	.Mouse/x DEI2 .mouse/x STZ2
504
+	.Mouse/y DEI2 .mouse/y STZ2
505 505
 
506 506
 	( draw new cursor )
507
-	.mouse/x PEK2 .Screen/x DEO2
508
-	.mouse/y PEK2 .Screen/y DEO2
507
+	.mouse/x LDZ2 .Screen/x DEO2
508
+	.mouse/y LDZ2 .Screen/y DEO2
509 509
 	;cursor_icn .Screen/addr DEO2
510 510
 	#3f .Mouse/state DEI #01 EQU #0a MUL SUB .Screen/color DEO
511 511
 
... ...
@@ -513,32 +513,32 @@ RTN
513 513
 
514 514
 @draw-textarea ( x y color addr )
515 515
 	
516
-	;document/body .textarea/addr POK2
516
+	;document/body .textarea/addr STZ2
517 517
 
518 518
 	( scroll to position )
519
-	#0000 .j POK2 ( j is linebreaks )
519
+	#0000 .j STZ2 ( j is linebreaks )
520 520
 	&find-offset
521
-		.scroll/y PEK2 .j PEK2 EQU2 ,&find-offset-end JCN
522
-		.textarea/addr PEK2 LDA #0a NEQ .textarea/addr PEK2 LDA #0d NEQ #0101 EQU2 ,&no-break JCN
523
-			( incr ) .j PEK2 ++ .j POK2 &no-break
524
-		( incr ) .textarea/addr PEK2 ++ .textarea/addr POK2
525
-	.textarea/addr PEK2 LDA #00 NEQ ,&find-offset JCN
521
+		.scroll/y LDZ2 .j LDZ2 EQU2 ,&find-offset-end JCN
522
+		.textarea/addr LDZ2 LDA #0a NEQ .textarea/addr LDZ2 LDA #0d NEQ #0101 EQU2 ,&no-break JCN
523
+			( incr ) .j LDZ2 ++ .j STZ2 &no-break
524
+		( incr ) .textarea/addr LDZ2 ++ .textarea/addr STZ2
525
+	.textarea/addr LDZ2 LDA #00 NEQ ,&find-offset JCN
526 526
 	&find-offset-end
527 527
 
528 528
 	#0018 .Screen/x DEO2 #0000 .Screen/y DEO2
529
-	.textarea/addr PEK2 .i POK2
529
+	.textarea/addr LDZ2 .i STZ2
530 530
 
531 531
 	&loop
532 532
 
533 533
 		.Screen/y DEI2 .Screen/height DEI2 #0010 SUB2 GTH2 ;&end JCN2
534 534
 
535 535
 
536
-		.i PEK2 LDA #0a NEQ .i PEK2 LDA #0d NEQ #0101 EQU2 ;&no-linebreak JCN2
536
+		.i LDZ2 LDA #0a NEQ .i LDZ2 LDA #0d NEQ #0101 EQU2 ;&no-linebreak JCN2
537 537
 			( draw linebreak )
538 538
 			;linebreak_icn .Screen/addr DEO2
539 539
 			( draw ) #02
540
-			.i PEK2 .selection/from PEK2 -- GTH2
541
-			.i PEK2 .selection/to PEK2 LTH2 #0101 EQU2
540
+			.i LDZ2 .selection/from LDZ2 -- GTH2
541
+			.i LDZ2 .selection/to LDZ2 LTH2 #0101 EQU2
542 542
 			#26 MUL ADD .Screen/color DEO
543 543
 			( fill clear )
544 544
 			&fill-clear
... ...
@@ -549,13 +549,13 @@ RTN
549 549
 
550 550
 			( draw line number )
551 551
 			#0000 .Screen/x DEO2
552
-			.scroll/y PEK2 .Screen/y DEI2 8/ ADD2 DUP2 SWP POP .k POK
553
-			.position/y PEK2 EQU2 #05 MUL .l POK
554
-			;font_hex #00 .k PEK #f0 AND #04 SFT #08 MUL ADD2 .Screen/addr DEO2
555
-			#24 .l PEK ADD .Screen/color DEO
552
+			.scroll/y LDZ2 .Screen/y DEI2 8/ ADD2 DUP2 SWP POP .k STZ
553
+			.position/y LDZ2 EQU2 #05 MUL .l STZ
554
+			;font_hex #00 .k LDZ #f0 AND #04 SFT #08 MUL ADD2 .Screen/addr DEO2
555
+			#24 .l LDZ ADD .Screen/color DEO
556 556
 			#0008 .Screen/x DEO2
557
-			;font_hex #00 .k PEK #0f AND #08 MUL ADD2 .Screen/addr DEO2
558
-			#24 .l PEK ADD .Screen/color DEO
557
+			;font_hex #00 .k LDZ #0f AND #08 MUL ADD2 .Screen/addr DEO2
558
+			#24 .l LDZ ADD .Screen/color DEO
559 559
 
560 560
 			#0010 .Screen/x DEO2
561 561
 			( incr ) .Screen/y DEI2 8+ .Screen/y DEO2
... ...
@@ -563,19 +563,19 @@ RTN
563 563
 
564 564
 
565 565
 		( get character )
566
-		;font #00 .i PEK2 LDA #20 SUB 8* ADD2 .Screen/addr DEO2
566
+		;font #00 .i LDZ2 LDA #20 SUB 8* ADD2 .Screen/addr DEO2
567 567
 		( is a special character )
568
-		.i PEK2 LDA #20 GTH ,&no-tab JCN ;font .Screen/addr DEO2 &no-tab
568
+		.i LDZ2 LDA #20 GTH ,&no-tab JCN ;font .Screen/addr DEO2 &no-tab
569 569
 
570 570
 		( draw ) #21
571
-		.i PEK2 .selection/from PEK2 -- GTH2
572
-		.i PEK2 .selection/to PEK2 LTH2 #0101 EQU2
571
+		.i LDZ2 .selection/from LDZ2 -- GTH2
572
+		.i LDZ2 .selection/to LDZ2 LTH2 #0101 EQU2
573 573
 		#05 MUL ADD .Screen/color DEO
574 574
 
575
-		( incr ) .i PEK2 ++ .i POK2
575
+		( incr ) .i LDZ2 ++ .i STZ2
576 576
 		( incr ) .Screen/x DEI2 #0007 ADD2 .Screen/x DEO2
577 577
 
578
-	.i PEK2 LDA #00 NEQ ;&loop JCN2
578
+	.i LDZ2 LDA #00 NEQ ;&loop JCN2
579 579
 
580 580
 	&end
581 581
 
... ...
@@ -596,7 +596,7 @@ RTN
596 596
 		OVR2 OVR2 LTH2 ,&loop JCN
597 597
 	POP2 POP2
598 598
 
599
-	.scroll/y PEK2 8+ .Screen/y DEO2
599
+	.scroll/y LDZ2 8+ .Screen/y DEO2
600 600
 	DUP2 #0008 ADD2 .Screen/addr DEO2
601 601
 	( draw ) #21 .Screen/color DEO
602 602
 
... ...
@@ -613,16 +613,16 @@ RTN
613 613
 @draw-titlebar
614 614
 	
615 615
 	#0018 .Screen/height DEI2 8- #29 ;filepath
616
-	( load ) .label/addr POK2 .label/color POK .Screen/y DEO2 .Screen/x DEO2
617
-	.label/addr PEK2
616
+	( load ) .label/addr STZ2 .label/color STZ .Screen/y DEO2 .Screen/x DEO2
617
+	.label/addr LDZ2
618 618
 	&loop
619
-		( draw ) DUP2 LDA #00 SWP #20 SUB 8* ;font ADD2 .Screen/addr DEO2 .label/color PEK .Screen/color DEO
619
+		( draw ) DUP2 LDA #00 SWP #20 SUB 8* ;font ADD2 .Screen/addr DEO2 .label/color LDZ .Screen/color DEO
620 620
 		( incr ) ++
621 621
 		( incr ) .Screen/x DEI2 8+ .Screen/x DEO2
622 622
 		DUP2 LDA #00 NEQ ,&loop JCN
623 623
 	POP2
624 624
 	( selection )
625
-	.selection/from PEK2 ;document/body SUB2 ;draw-short JSR2
625
+	.selection/from LDZ2 ;document/body SUB2 ;draw-short JSR2
626 626
 
627 627
 RTN
628 628
 
... ...
@@ -103,31 +103,31 @@
103 103
 	;on-transfer .File/vector DEO2
104 104
 
105 105
 	( set defaults )
106
-	#0130 .frame/width POK2
107
-	#00a8 .frame/height POK2
108
-	#01 .settings/brush POK
109
-	#32 .settings/ratio POK
110
-
111
-	.Screen/width DEI2 #0001 SFT2 .frame/width PEK2 #0001 SFT2 SUB2
112
-	.Screen/height DEI2 #0001 SFT2 .frame/height PEK2 #0001 SFT2 SUB2 #0010 ADD2
113
-	.frame/width PEK2 .frame/height PEK2
106
+	#0130 .frame/width STZ2
107
+	#00a8 .frame/height STZ2
108
+	#01 .settings/brush STZ
109
+	#32 .settings/ratio STZ
110
+
111
+	.Screen/width DEI2 #0001 SFT2 .frame/width LDZ2 #0001 SFT2 SUB2
112
+	.Screen/height DEI2 #0001 SFT2 .frame/height LDZ2 #0001 SFT2 SUB2 #0010 ADD2
113
+	.frame/width LDZ2 .frame/height LDZ2
114 114
 	SIZE-TO-RECT ;frame SET-RECT
115 115
 
116
-	.frame/x1 PEK2 #0010 ADD2 .bankview/x POK2
117
-	.frame/y1 PEK2 .bankview/y POK2
118
-	BANK .settings/page POK2
116
+	.frame/x1 LDZ2 #0010 ADD2 .bankview/x STZ2
117
+	.frame/y1 LDZ2 .bankview/y STZ2
118
+	BANK .settings/page STZ2
119 119
 
120
-	.frame/x2 PEK2 #0098 SUB2 .tileview/x POK2
121
-	.frame/y1 PEK2 .tileview/y POK2
122
-	BANK #0448 ADD2 .settings/tile POK2
120
+	.frame/x2 LDZ2 #0098 SUB2 .tileview/x STZ2
121
+	.frame/y1 LDZ2 .tileview/y STZ2
122
+	BANK #0448 ADD2 .settings/tile STZ2
123 123
 
124
-	.frame/x2 PEK2 #0010 SUB2 .frame/y1 PEK2 #0010 #0080 SIZE-TO-RECT ;dataview SET-RECT
125
-	.frame/x1 PEK2 #0010 ADD2 .frame/y2 PEK2 #0020 SUB2 #0020 #0020 SIZE-TO-RECT ;blendview SET-RECT
126
-	.frame/x1 PEK2 #0060 ADD2 .frame/y2 PEK2 #0020 SUB2 #0020 #0020 SIZE-TO-RECT ;colorview SET-RECT
127
-	.frame/x1 PEK2 #0038 ADD2 .frame/y2 PEK2 #0020 SUB2 #0020 #0020 SIZE-TO-RECT ;preview SET-RECT
128
-	.frame/x2 PEK2 #0098 SUB2 .frame/y1 PEK2 #0080 #0080 SIZE-TO-RECT ;editview SET-RECT
124
+	.frame/x2 LDZ2 #0010 SUB2 .frame/y1 LDZ2 #0010 #0080 SIZE-TO-RECT ;dataview SET-RECT
125
+	.frame/x1 LDZ2 #0010 ADD2 .frame/y2 LDZ2 #0020 SUB2 #0020 #0020 SIZE-TO-RECT ;blendview SET-RECT
126
+	.frame/x1 LDZ2 #0060 ADD2 .frame/y2 LDZ2 #0020 SUB2 #0020 #0020 SIZE-TO-RECT ;colorview SET-RECT
127
+	.frame/x1 LDZ2 #0038 ADD2 .frame/y2 LDZ2 #0020 SUB2 #0020 #0020 SIZE-TO-RECT ;preview SET-RECT
128
+	.frame/x2 LDZ2 #0098 SUB2 .frame/y1 LDZ2 #0080 #0080 SIZE-TO-RECT ;editview SET-RECT
129 129
 
130
-	#01 .settings/blending POK
130
+	#01 .settings/blending STZ
131 131
 
132 132
 	;filepath1 .File/name DEO2 #0800 .File/length DEO2 BANK .File/load DEO2
133 133
 	;filepath2 .File/name DEO2 #0800 .File/length DEO2 BANK #0800 ADD2 .File/load DEO2
... ...
@@ -136,7 +136,7 @@
136 136
 	;filepath5 .File/name DEO2 #1000 .File/length DEO2 BANK #2800 ADD2 .File/load DEO2
137 137
 	;filepath6 .File/name DEO2 #1000 .File/length DEO2 BANK #3800 ADD2 .File/load DEO2
138 138
 
139
-	#40 DUP .bankview/selection POK ;select-tile JSR2
139
+	#40 DUP .bankview/selection STZ ;select-tile JSR2
140 140
 
141 141
 BRK
142 142
 
... ...
@@ -150,28 +150,28 @@ BRK
150 150
 	
151 151
 	( skip ) .Controller/button DEI #00 NEQ #01 JCN [ BRK ]
152 152
 
153
-	.Controller/button DEI #11 NEQ ,&no-pageup JCN .settings/page PEK2
154
-		#0800 SUB2 .settings/page POK2 
153
+	.Controller/button DEI #11 NEQ ,&no-pageup JCN .settings/page LDZ2
154
+		#0800 SUB2 .settings/page STZ2 
155 155
 		;redraw JSR2 
156 156
 		BRK &no-pageup
157 157
 
158
-	.Controller/button DEI #21 NEQ ,&no-pagedown JCN .settings/page PEK2
159
-		#0800 ADD2 .settings/page POK2 
158
+	.Controller/button DEI #21 NEQ ,&no-pagedown JCN .settings/page LDZ2
159
+		#0800 ADD2 .settings/page STZ2 
160 160
 		;redraw JSR2 
161 161
 		BRK &no-pagedown
162 162
 
163 163
 	.Controller/button DEI #f0 AND
164 164
 		DUP #04 SFT #01 AND #01 NEQ ,&no-up JCN
165
-			( move ) .bankview/selection PEK #10 SUB .bankview/selection POK &no-up
165
+			( move ) .bankview/selection LDZ #10 SUB .bankview/selection STZ &no-up
166 166
 		DUP #05 SFT #01 AND #01 NEQ ,&no-down JCN
167
-			( move ) .bankview/selection PEK #10 ADD .bankview/selection POK &no-down
167
+			( move ) .bankview/selection LDZ #10 ADD .bankview/selection STZ &no-down
168 168
 		DUP #06 SFT #01 AND #01 NEQ ,&no-left JCN
169
-			( move ) .bankview/selection PEK #01 SUB .bankview/selection POK &no-left
169
+			( move ) .bankview/selection LDZ #01 SUB .bankview/selection STZ &no-left
170 170
 		DUP #07 SFT #01 AND #01 NEQ ,&no-right JCN
171
-			( move ) .bankview/selection PEK #01 ADD .bankview/selection POK &no-right
171
+			( move ) .bankview/selection LDZ #01 ADD .bankview/selection STZ &no-right
172 172
 		POP
173 173
 
174
-	.bankview/selection PEK ;select-tile JSR2
174
+	.bankview/selection LDZ ;select-tile JSR2
175 175
 
176 176
 BRK
177 177
 
... ...
@@ -182,13 +182,13 @@ BRK
182 182
 	( skip ) .Mouse/state DEI #00 NEQ #01 JCN [ BRK ]
183 183
 
184 184
 	( toolbar )
185
-	.Mouse/y DEI2 .bankview/y PEK2 #0010 SUB2 SUB2 #0008 DIV2 #0000 NEQ2 ;&no-toolbar-click JCN2
185
+	.Mouse/y DEI2 .bankview/y LDZ2 #0010 SUB2 SUB2 #0008 DIV2 #0000 NEQ2 ;&no-toolbar-click JCN2
186 186
 		( brush )
187
-		.Mouse/x DEI2 .bankview/x PEK2 SUB2 #0008 DIV2 #000d LTH2 ,&no-brush-click JCN
188
-		.Mouse/x DEI2 .bankview/x PEK2 SUB2 #0008 DIV2 #000f GTH2 ,&no-brush-click JCN
189
-			( select ) .mouse/x PEK2 .bankview/x PEK2 SUB2 #0008 DIV2 #000d SUB2 TOB .bankview/mode POK
187
+		.Mouse/x DEI2 .bankview/x LDZ2 SUB2 #0008 DIV2 #000d LTH2 ,&no-brush-click JCN
188
+		.Mouse/x DEI2 .bankview/x LDZ2 SUB2 #0008 DIV2 #000f GTH2 ,&no-brush-click JCN
189
+			( select ) .mouse/x LDZ2 .bankview/x LDZ2 SUB2 #0008 DIV2 #000d SUB2 TOB .bankview/mode STZ
190 190
 		&no-brush-click
191
-		.Mouse/x DEI2 .bankview/x PEK2 SUB2 #0008 DIV2 #0005 NEQ2 ,&no-toggle-depth JCN
191
+		.Mouse/x DEI2 .bankview/x LDZ2 SUB2 #0008 DIV2 #0005 NEQ2 ,&no-toggle-depth JCN
192 192
 			;toggle-depth JSR2
193 193
 		&no-toggle-depth
194 194
 			( release ) #00 .Mouse/state DEO
... ...
@@ -196,77 +196,77 @@ BRK
196 196
 	&no-toolbar-click
197 197
 
198 198
 	( bankview )
199
-	.Mouse/x DEI2 .bankview/x PEK2 GTH2 .Mouse/x DEI2 .bankview/x PEK2 #0080 ADD2 LTH2 #0101 EQU2
200
-	.Mouse/y DEI2 .bankview/y PEK2 GTH2 .Mouse/y DEI2 .bankview/y PEK2 #0080 ADD2 LTH2 #0101 EQU2
199
+	.Mouse/x DEI2 .bankview/x LDZ2 GTH2 .Mouse/x DEI2 .bankview/x LDZ2 #0080 ADD2 LTH2 #0101 EQU2
200
+	.Mouse/y DEI2 .bankview/y LDZ2 GTH2 .Mouse/y DEI2 .bankview/y LDZ2 #0080 ADD2 LTH2 #0101 EQU2
201 201
 	#0101 EQU2 ;on-touch-bankview JCN2
202 202
 
203 203
 	( tileview )
204
-	.Mouse/x DEI2 .tileview/x PEK2 GTH2 .Mouse/x DEI2 .tileview/x PEK2 #0080 ADD2 LTH2 #0101 EQU2
205
-	.Mouse/y DEI2 .tileview/y PEK2 GTH2 .Mouse/y DEI2 .tileview/y PEK2 #0080 ADD2 LTH2 #0101 EQU2
204
+	.Mouse/x DEI2 .tileview/x LDZ2 GTH2 .Mouse/x DEI2 .tileview/x LDZ2 #0080 ADD2 LTH2 #0101 EQU2
205
+	.Mouse/y DEI2 .tileview/y LDZ2 GTH2 .Mouse/y DEI2 .tileview/y LDZ2 #0080 ADD2 LTH2 #0101 EQU2
206 206
 	#0101 EQU2 ;on-touch-tileview JCN2
207 207
 
208 208
 	( editview )
209
-	.Mouse/x DEI2 DUP2 .editview/x1 PEK2 GTH2 ROT ROT .editview/x2 PEK2 LTH2 #0101 EQU2
210
-	.Mouse/y DEI2 DUP2 .editview/y1 PEK2 GTH2 ROT ROT .editview/y2 PEK2 LTH2 #0101 EQU2
209
+	.Mouse/x DEI2 DUP2 .editview/x1 LDZ2 GTH2 ROT ROT .editview/x2 LDZ2 LTH2 #0101 EQU2
210
+	.Mouse/y DEI2 DUP2 .editview/y1 LDZ2 GTH2 ROT ROT .editview/y2 LDZ2 LTH2 #0101 EQU2
211 211
 	#0101 EQU2 ;on-touch-editview JCN2
212 212
 
213 213
 	( dataview )
214
-	.Mouse/x DEI2 DUP2 .dataview/x1 PEK2 GTH2 ROT ROT .dataview/x2 PEK2 LTH2 #0101 EQU2
215
-	.Mouse/y DEI2 DUP2 .dataview/y1 PEK2 GTH2 ROT ROT .dataview/y2 PEK2 LTH2 #0101 EQU2
214
+	.Mouse/x DEI2 DUP2 .dataview/x1 LDZ2 GTH2 ROT ROT .dataview/x2 LDZ2 LTH2 #0101 EQU2
215
+	.Mouse/y DEI2 DUP2 .dataview/y1 LDZ2 GTH2 ROT ROT .dataview/y2 LDZ2 LTH2 #0101 EQU2
216 216
 	#0101 EQU2 ;on-touch-dataview JCN2
217 217
 
218 218
 	( blendbiew )
219
-	.Mouse/x DEI2 DUP2 .blendview/x1 PEK2 GTH2 ROT ROT .blendview/x2 PEK2 LTH2 #0101 EQU2
220
-	.Mouse/y DEI2 DUP2 .blendview/y1 PEK2 GTH2 ROT ROT .blendview/y2 PEK2 LTH2 #0101 EQU2
219
+	.Mouse/x DEI2 DUP2 .blendview/x1 LDZ2 GTH2 ROT ROT .blendview/x2 LDZ2 LTH2 #0101 EQU2
220
+	.Mouse/y DEI2 DUP2 .blendview/y1 LDZ2 GTH2 ROT ROT .blendview/y2 LDZ2 LTH2 #0101 EQU2
221 221
 	#0101 EQU2 ;on-touch-blendview JCN2
222 222
 
223 223
 	( colorview )
224
-	.Mouse/x DEI2 DUP2 .colorview/x1 PEK2 GTH2 ROT ROT .colorview/x2 PEK2 LTH2 #0101 EQU2
225
-	.Mouse/y DEI2 DUP2 .colorview/y1 PEK2 GTH2 ROT ROT .colorview/y2 PEK2 LTH2 #0101 EQU2
224
+	.Mouse/x DEI2 DUP2 .colorview/x1 LDZ2 GTH2 ROT ROT .colorview/x2 LDZ2 LTH2 #0101 EQU2
225
+	.Mouse/y DEI2 DUP2 .colorview/y1 LDZ2 GTH2 ROT ROT .colorview/y2 LDZ2 LTH2 #0101 EQU2
226 226
 	#0101 EQU2 ;on-touch-colorview JCN2
227 227
 
228 228
 	( preview )
229
-	.Mouse/x DEI2 DUP2 .preview/x1 PEK2 GTH2 ROT ROT .preview/x2 PEK2 LTH2 #0101 EQU2
230
-	.Mouse/y DEI2 DUP2 .preview/y1 PEK2 GTH2 ROT ROT .preview/y2 PEK2 LTH2 #0101 EQU2
229
+	.Mouse/x DEI2 DUP2 .preview/x1 LDZ2 GTH2 ROT ROT .preview/x2 LDZ2 LTH2 #0101 EQU2
230
+	.Mouse/y DEI2 DUP2 .preview/y1 LDZ2 GTH2 ROT ROT .preview/y2 LDZ2 LTH2 #0101 EQU2
231 231
 	#0101 EQU2 ;on-touch-preview JCN2
232 232
 
233 233
 BRK
234 234
 
235 235
 @on-touch-bankview ( -> )
236 236
 	
237
-	.bankview/mode PEK #01 NEQ ,&not-copy-mode JCN
238
-		#00 .i POK
237
+	.bankview/mode LDZ #01 NEQ ,&not-copy-mode JCN
238
+		#00 .i STZ
239 239
 		&copy-loop
240
-			( load ) .settings/tile PEK2 .i PEK ADD LDA
240
+			( load ) .settings/tile LDZ2 .i LDZ ADD LDA
241 241
 			( get touch addr )
242
-			.Mouse/x DEI2 .bankview/x PEK2 SUB2 STEP8
243
-			.Mouse/y DEI2 .bankview/y PEK2 SUB2 STEP8 #0010 MUL2 ADD2
244
-			( 2-bit mode ) #00 .settings/depth PEK #01 ADD MUL2
245
-			.settings/page PEK2 ADD2 #00 .i PEK ADD2 STA
246
-			( incr ) .i PEK #01 ADD .i POK
247
-			.i PEK #08 LTH ,&copy-loop JCN
242
+			.Mouse/x DEI2 .bankview/x LDZ2 SUB2 STEP8
243
+			.Mouse/y DEI2 .bankview/y LDZ2 SUB2 STEP8 #0010 MUL2 ADD2
244
+			( 2-bit mode ) #00 .settings/depth LDZ #01 ADD MUL2
245
+			.settings/page LDZ2 ADD2 #00 .i LDZ ADD2 STA
246
+			( incr ) .i LDZ #01 ADD .i STZ
247
+			.i LDZ #08 LTH ,&copy-loop JCN
248 248
 		;redraw JSR2 BRK
249 249
 	&not-copy-mode
250 250
 
251
-	.bankview/mode PEK #02 NEQ ,&not-erase-mode JCN
252
-		#00 .i POK
251
+	.bankview/mode LDZ #02 NEQ ,&not-erase-mode JCN
252
+		#00 .i STZ
253 253
 		&erase-loop
254 254
 			#00
255 255
 			( get touch addr )
256
-			.Mouse/x DEI2 .bankview/x PEK2 SUB2 STEP8
257
-			.Mouse/y DEI2 .bankview/y PEK2 SUB2 STEP8 #0010 MUL2 ADD2
258
-			( 2-bit mode ) #00 .settings/depth PEK #01 ADD MUL2
259
-			.settings/page PEK2 ADD2 #00 .i PEK ADD2 STA
260
-			( incr ) .i PEK #01 ADD .i POK
261
-			.i PEK #08 LTH ,&erase-loop JCN
256
+			.Mouse/x DEI2 .bankview/x LDZ2 SUB2 STEP8
257
+			.Mouse/y DEI2 .bankview/y LDZ2 SUB2 STEP8 #0010 MUL2 ADD2
258
+			( 2-bit mode ) #00 .settings/depth LDZ #01 ADD MUL2
259
+			.settings/page LDZ2 ADD2 #00 .i LDZ ADD2 STA
260
+			( incr ) .i LDZ #01 ADD .i STZ
261
+			.i LDZ #08 LTH ,&erase-loop JCN
262 262
 		;redraw JSR2 BRK
263 263
 	&not-erase-mode
264 264
 
265 265
 	( select )
266 266
 
267
-	.Mouse/x DEI2 .bankview/x PEK2 SUB2 #0008 DIV2 TOB
268
-	.Mouse/y DEI2 .bankview/y PEK2 SUB2 #0008 DIV2 TOB #40 SFT ADD
269
-	DUP .bankview/selection POK
267
+	.Mouse/x DEI2 .bankview/x LDZ2 SUB2 #0008 DIV2 TOB
268
+	.Mouse/y DEI2 .bankview/y LDZ2 SUB2 #0008 DIV2 TOB #40 SFT ADD
269
+	DUP .bankview/selection STZ
270 270
 	;select-tile JSR2
271 271
 
272 272
 BRK
... ...
@@ -284,8 +284,8 @@ BRK
284 284
 
285 285
 @on-touch-dataview ( -> )
286 286
 
287
-	.Mouse/y DEI2 .dataview/y1 PEK2 SUB2 STEP8 TOB #60 EQU ,&skip JCN BRK &skip
288
-	.Mouse/x DEI2 .dataview/x1 PEK2 SUB2 #0008 DIV2 TOB
287
+	.Mouse/y DEI2 .dataview/y1 LDZ2 SUB2 STEP8 TOB #60 EQU ,&skip JCN BRK &skip
288
+	.Mouse/x DEI2 .dataview/x1 LDZ2 SUB2 #0008 DIV2 TOB
289 289
 	DUP #00 NEQ ,&no-move-up JCN
290 290
 		;op_shiftup JSR2
291 291
 		( release ) #00 .Mouse/state DEO
... ...
@@ -300,9 +300,9 @@ BRK
300 300
 
301 301
 @on-touch-blendview ( -> )
302 302
 
303
-	.Mouse/x DEI2 .blendview/x1 PEK2 SUB2 #0008 DIV2 TOB
304
-	.Mouse/y DEI2 .blendview/y1 PEK2 SUB2 #0008 DIV2 TOB #04 MUL ADD
305
-	.settings/blending POK
303
+	.Mouse/x DEI2 .blendview/x1 LDZ2 SUB2 #0008 DIV2 TOB
304
+	.Mouse/y DEI2 .blendview/y1 LDZ2 SUB2 #0008 DIV2 TOB #04 MUL ADD
305
+	.settings/blending STZ
306 306
 	( release ) #00 .Mouse/state DEO
307 307
 	;redraw JSR2
308 308
 
... ...
@@ -310,10 +310,10 @@ BRK
310 310
 
311 311
 @on-touch-colorview ( -> )
312 312
 
313
-	( channel ) .Mouse/y DEI2 .colorview/y1 PEK2 SUB2 #0008 DIV2 TOB STH
314
-	( rgb ) .Mouse/x DEI2 .colorview/x1 PEK2 SUB2 #0008 DIV2 TOB
313
+	( channel ) .Mouse/y DEI2 .colorview/y1 LDZ2 SUB2 #0008 DIV2 TOB STH
314
+	( rgb ) .Mouse/x DEI2 .colorview/x1 LDZ2 SUB2 #0008 DIV2 TOB
315 315
 	DUP #00 NEQ ,&no-brush JCN
316
-		DUPr STHr .settings/brush POK &no-brush
316
+		DUPr STHr .settings/brush STZ &no-brush
317 317
 	DUP #01 NEQ ,&no-red JCN
318 318
 		DUPr STHr .System/r ;set-color JSR2 &no-red
319 319
 	DUP #02 NEQ ,&no-green JCN
... ...
@@ -328,11 +328,11 @@ BRK
328 328
 
329 329
 @on-touch-preview ( -> )
330 330
 
331
-	( y ) .Mouse/y DEI2 .preview/y1 PEK2 SUB2 #0008 DIV2 TOB
332
-	( x ) .Mouse/x DEI2 .preview/x1 PEK2 SUB2 #0008 DIV2 TOB
331
+	( y ) .Mouse/y DEI2 .preview/y1 LDZ2 SUB2 #0008 DIV2 TOB
332
+	( x ) .Mouse/x DEI2 .preview/x1 LDZ2 SUB2 #0008 DIV2 TOB
333 333
 
334 334
 	#40 SFT ADD #11 ADD
335
-	.settings/ratio POK
335
+	.settings/ratio STZ
336 336
 
337 337
 	( release ) #00 .Mouse/state DEO
338 338
 	;redraw JSR2
... ...
@@ -372,45 +372,45 @@ RTN
372 372
 	( x y ) DUP #0f AND SWP #04 SFT
373 373
 	( y ) #10 MOD #10 MUL #00 SWP #0008 MUL2
374 374
 	( x ) ROT #10 MOD #00 SWP #0008 MUL2 ADD2
375
-	( 2-bit mode ) #00 .settings/depth PEK #01 ADD MUL2
376
-	( offset ) .settings/page PEK2 ADD2 .settings/tile POK2
375
+	( 2-bit mode ) #00 .settings/depth LDZ #01 ADD MUL2
376
+	( offset ) .settings/page LDZ2 ADD2 .settings/tile STZ2
377 377
 	;redraw JSR2
378 378
 
379 379
 RTN
380 380
 
381 381
 @toggle-depth ( -- )
382 382
 	
383
-	.bankview/selection PEK
384
-	.settings/depth PEK #00 EQU .settings/depth POK
383
+	.bankview/selection LDZ
384
+	.settings/depth LDZ #00 EQU .settings/depth STZ
385 385
 	;select-tile JSR2
386 386
 
387 387
 RTN
388 388
 
389 389
 @op_shiftup ( -- )
390 390
 	
391
-	.settings/tile PEK2 LDA
392
-	.settings/tile PEK2 #0001 ADD2 LDA .settings/tile PEK2 STA
393
-	.settings/tile PEK2 #0002 ADD2 LDA .settings/tile PEK2 #0001 ADD2 STA
394
-	.settings/tile PEK2 #0003 ADD2 LDA .settings/tile PEK2 #0002 ADD2 STA
395
-	.settings/tile PEK2 #0004 ADD2 LDA .settings/tile PEK2 #0003 ADD2 STA
396
-	.settings/tile PEK2 #0005 ADD2 LDA .settings/tile PEK2 #0004 ADD2 STA
397
-	.settings/tile PEK2 #0006 ADD2 LDA .settings/tile PEK2 #0005 ADD2 STA
398
-	.settings/tile PEK2 #0007 ADD2 LDA .settings/tile PEK2 #0006 ADD2 STA
399
-	.settings/tile PEK2 #0007 ADD2 STA
391
+	.settings/tile LDZ2 LDA
392
+	.settings/tile LDZ2 #0001 ADD2 LDA .settings/tile LDZ2 STA
393
+	.settings/tile LDZ2 #0002 ADD2 LDA .settings/tile LDZ2 #0001 ADD2 STA
394
+	.settings/tile LDZ2 #0003 ADD2 LDA .settings/tile LDZ2 #0002 ADD2 STA
395
+	.settings/tile LDZ2 #0004 ADD2 LDA .settings/tile LDZ2 #0003 ADD2 STA
396
+	.settings/tile LDZ2 #0005 ADD2 LDA .settings/tile LDZ2 #0004 ADD2 STA
397
+	.settings/tile LDZ2 #0006 ADD2 LDA .settings/tile LDZ2 #0005 ADD2 STA
398
+	.settings/tile LDZ2 #0007 ADD2 LDA .settings/tile LDZ2 #0006 ADD2 STA
399
+	.settings/tile LDZ2 #0007 ADD2 STA
400 400
 
401 401
 RTN
402 402
 
403 403
 @op_shiftdown ( -- )
404 404
 	
405
-	.settings/tile PEK2 #0007 ADD2 LDA
406
-	.settings/tile PEK2 #0006 ADD2 LDA .settings/tile PEK2 #0007 ADD2 STA
407
-	.settings/tile PEK2 #0005 ADD2 LDA .settings/tile PEK2 #0006 ADD2 STA
408
-	.settings/tile PEK2 #0004 ADD2 LDA .settings/tile PEK2 #0005 ADD2 STA
409
-	.settings/tile PEK2 #0003 ADD2 LDA .settings/tile PEK2 #0004 ADD2 STA
410
-	.settings/tile PEK2 #0002 ADD2 LDA .settings/tile PEK2 #0003 ADD2 STA
411
-	.settings/tile PEK2 #0001 ADD2 LDA .settings/tile PEK2 #0002 ADD2 STA
412
-	.settings/tile PEK2 LDA .settings/tile PEK2 #0001 ADD2 STA
413
-	.settings/tile PEK2 STA
405
+	.settings/tile LDZ2 #0007 ADD2 LDA
406
+	.settings/tile LDZ2 #0006 ADD2 LDA .settings/tile LDZ2 #0007 ADD2 STA
407
+	.settings/tile LDZ2 #0005 ADD2 LDA .settings/tile LDZ2 #0006 ADD2 STA
408
+	.settings/tile LDZ2 #0004 ADD2 LDA .settings/tile LDZ2 #0005 ADD2 STA
409
+	.settings/tile LDZ2 #0003 ADD2 LDA .settings/tile LDZ2 #0004 ADD2 STA
410
+	.settings/tile LDZ2 #0002 ADD2 LDA .settings/tile LDZ2 #0003 ADD2 STA
411
+	.settings/tile LDZ2 #0001 ADD2 LDA .settings/tile LDZ2 #0002 ADD2 STA
412
+	.settings/tile LDZ2 LDA .settings/tile LDZ2 #0001 ADD2 STA
413
+	.settings/tile LDZ2 STA
414 414
 
415 415
 RTN
416 416
 
... ...
@@ -427,42 +427,42 @@ RTN
427 427
 
428 428
 @draw-bankview ( -- )
429 429
 	
430
-	.bankview/x PEK2 #0002 SUB2 .bankview/y PEK2 #0002 SUB2 .bankview/x PEK2 #0081 ADD2 .bankview/y PEK2 #0081 ADD2 #03 ;line-rect JSR2
430
+	.bankview/x LDZ2 #0002 SUB2 .bankview/y LDZ2 #0002 SUB2 .bankview/x LDZ2 #0081 ADD2 .bankview/y LDZ2 #0081 ADD2 #03 ;line-rect JSR2
431 431
 
432 432
 	( position )
433 433
 
434
-	.bankview/x PEK2 .Screen/x DEO2
435
-	.bankview/y PEK2 #0010 SUB2 .Screen/y DEO2
436
-	.settings/page PEK2 #22 ;draw-short JSR2
434
+	.bankview/x LDZ2 .Screen/x DEO2
435
+	.bankview/y LDZ2 #0010 SUB2 .Screen/y DEO2
436
+	.settings/page LDZ2 #22 ;draw-short JSR2
437 437
 
438 438
 	( toolbar )
439 439
 
440
-	.bankview/y PEK2 #0010 SUB2 .Screen/y DEO2
440
+	.bankview/y LDZ2 #0010 SUB2 .Screen/y DEO2
441 441
 
442
-	.bankview/x PEK2 #0028 ADD2 .Screen/x DEO2
443
-	;depth_icns #00 .settings/depth PEK #0008 MUL2 ADD2 .Screen/addr DEO2
442
+	.bankview/x LDZ2 #0028 ADD2 .Screen/x DEO2
443
+	;depth_icns #00 .settings/depth LDZ #0008 MUL2 ADD2 .Screen/addr DEO2
444 444
 	#23 .Screen/color DEO
445 445
 
446
-	.bankview/x PEK2 #0068 ADD2 .Screen/x DEO2
446
+	.bankview/x LDZ2 #0068 ADD2 .Screen/x DEO2
447 447
 	;tool_selector .Screen/addr DEO2
448
-	#21 .bankview/mode PEK #00 EQU ADD .Screen/color DEO
448
+	#21 .bankview/mode LDZ #00 EQU ADD .Screen/color DEO
449 449
 
450 450
 	.Screen/x DEI2 #0008 ADD2 .Screen/x DEO2
451 451
 	;tool_hand .Screen/addr DEO2
452
-	#21 .bankview/mode PEK #01 EQU ADD .Screen/color DEO
452
+	#21 .bankview/mode LDZ #01 EQU ADD .Screen/color DEO
453 453
 
454 454
 	.Screen/x DEI2 #0008 ADD2 .Screen/x DEO2
455 455
 	;tool_eraser .Screen/addr DEO2
456
-	#21 .bankview/mode PEK #02 EQU ADD .Screen/color DEO
456
+	#21 .bankview/mode LDZ #02 EQU ADD .Screen/color DEO
457 457
 
458 458
 	( guides )
459 459
 
460
-	.bankview/x PEK2 #0010 SUB2 .Screen/x DEO2
461
-	.bankview/y PEK2 .Screen/y DEO2
460
+	.bankview/x LDZ2 #0010 SUB2 .Screen/x DEO2
461
+	.bankview/y LDZ2 .Screen/y DEO2
462 462
 	;font-hex .Screen/addr DEO2
463 463
 	#00 #10
464 464
 	&guides
465
-		( draw ) OVR .bankview/selection PEK #04 SFT EQU #22 ADD .Screen/color DEO
465
+		( draw ) OVR .bankview/selection LDZ #04 SFT EQU #22 ADD .Screen/color DEO
466 466
 		.Screen/addr DEI2 #0008 ADD2 .Screen/addr DEO2
467 467
 		.Screen/y DEI2 #0008 ADD2 .Screen/y DEO2
468 468
 		SWP #01 ADD SWP
... ...
@@ -471,19 +471,19 @@ RTN
471 471
 
472 472
 	( draw page )
473 473
 
474
-	( load ) .settings/page PEK2 .Screen/addr DEO2
475
-	.bankview/y PEK2 DUP2 #0080 ADD2
474
+	( load ) .settings/page LDZ2 .Screen/addr DEO2
475
+	.bankview/y LDZ2 DUP2 #0080 ADD2
476 476
 	&ver
477 477
 		( save ) OVR2 .Screen/y DEO2
478
-		.bankview/x PEK2 DUP2 #0080 ADD2
478
+		.bankview/x LDZ2 DUP2 #0080 ADD2
479 479
 		&hor
480 480
 			( save ) OVR2 .Screen/x DEO2
481
-			( get selected ) .Screen/addr DEI2 .settings/tile PEK2 EQU2
482
-			( get blending ) .settings/blending PEK
483
-			( get depth ) .settings/depth PEK #20 MUL
481
+			( get selected ) .Screen/addr DEI2 .settings/tile LDZ2 EQU2
482
+			( get blending ) .settings/blending LDZ
483
+			( get depth ) .settings/depth LDZ #20 MUL
484 484
 			( draw ) #20 ADD ADD ADD .Screen/color DEO
485 485
 			( incr ) SWP2 #0008 ADD2 SWP2
486
-			( incr ) .Screen/addr DEI2 #0008 ADD2 #00 .settings/depth PEK #0008 MUL2 ADD2 .Screen/addr DEO2
486
+			( incr ) .Screen/addr DEI2 #0008 ADD2 #00 .settings/depth LDZ #0008 MUL2 ADD2 .Screen/addr DEO2
487 487
 			OVR2 OVR2 LTH2 ,&hor JCN
488 488
 		POP2 POP2
489 489
 		( incr ) SWP2 #0008 ADD2 SWP2
... ...
@@ -494,87 +494,87 @@ RTN
494 494
 
495 495
 @draw-tileview ( -- )
496 496
 
497
-	.tileview/x PEK2 #0002 SUB2 .tileview/y PEK2 #0002 SUB2 .tileview/x PEK2 #0080 ADD2 .tileview/y PEK2 #0081 ADD2 #03 ;line-rect JSR2
497
+	.tileview/x LDZ2 #0002 SUB2 .tileview/y LDZ2 #0002 SUB2 .tileview/x LDZ2 #0080 ADD2 .tileview/y LDZ2 #0081 ADD2 #03 ;line-rect JSR2
498 498
 
499
-	.tileview/x PEK2 #0028 ADD2 .Screen/x DEO2
500
-	.tileview/y PEK2 #0010 SUB2 .Screen/y DEO2
501
-	.settings/tile PEK2 .Screen/addr DEO2
499
+	.tileview/x LDZ2 #0028 ADD2 .Screen/x DEO2
500
+	.tileview/y LDZ2 #0010 SUB2 .Screen/y DEO2
501
+	.settings/tile LDZ2 .Screen/addr DEO2
502 502
 
503
-	( get blending ) .settings/blending PEK
504
-	( get depth ) .settings/depth PEK #20 MUL
503
+	( get blending ) .settings/blending LDZ
504
+	( get depth ) .settings/depth LDZ #20 MUL
505 505
 	( draw ) #20 ADD ADD .Screen/color DEO
506 506
 
507 507
 	( position )
508 508
 
509
-	.tileview/x PEK2 .Screen/x DEO2
510
-	.tileview/y PEK2 #0010 SUB2 .Screen/y DEO2
511
-	.settings/tile PEK2 #22 ;draw-short JSR2
509
+	.tileview/x LDZ2 .Screen/x DEO2
510
+	.tileview/y LDZ2 #0010 SUB2 .Screen/y DEO2
511
+	.settings/tile LDZ2 #22 ;draw-short JSR2
512 512
 
513 513
 	( body )
514 514
 
515
-	.tileview/x PEK2 .Screen/x DEO2
516
-	.tileview/y PEK2 .Screen/y DEO2
517
-	.settings/tile PEK2 .settings/tile POK2
515
+	.tileview/x LDZ2 .Screen/x DEO2
516
+	.tileview/y LDZ2 .Screen/y DEO2
517
+	.settings/tile LDZ2 .settings/tile STZ2
518 518
 	;draw-tileview-icn JSR2
519 519
 
520
-	.tileview/x PEK2 #0040 ADD2 .Screen/x DEO2
521
-	.tileview/y PEK2 .Screen/y DEO2
522
-	.settings/tile PEK2 #0008 ADD2 .settings/tile POK2
520
+	.tileview/x LDZ2 #0040 ADD2 .Screen/x DEO2
521
+	.tileview/y LDZ2 .Screen/y DEO2
522
+	.settings/tile LDZ2 #0008 ADD2 .settings/tile STZ2
523 523
 	;draw-tileview-icn JSR2
524 524
 
525
-	.tileview/x PEK2 .Screen/x DEO2
526
-	.tileview/y PEK2 #0040 ADD2 .Screen/y DEO2
527
-	.settings/tile PEK2 #0008 ADD2 .settings/tile POK2
525
+	.tileview/x LDZ2 .Screen/x DEO2
526
+	.tileview/y LDZ2 #0040 ADD2 .Screen/y DEO2
527
+	.settings/tile LDZ2 #0008 ADD2 .settings/tile STZ2
528 528
 	;draw-tileview-icn JSR2
529 529
 
530
-	.tileview/x PEK2 #0040 ADD2 .Screen/x DEO2
531
-	.tileview/y PEK2 #0040 ADD2 .Screen/y DEO2
532
-	.settings/tile PEK2 #0008 ADD2 .settings/tile POK2
530
+	.tileview/x LDZ2 #0040 ADD2 .Screen/x DEO2
531
+	.tileview/y LDZ2 #0040 ADD2 .Screen/y DEO2
532
+	.settings/tile LDZ2 #0008 ADD2 .settings/tile STZ2
533 533
 	;draw-tileview-icn JSR2
534 534
 
535 535
 	( line hor )
536
-	.tileview/y PEK2 #003f ADD2 .Screen/y DEO2
537
-	.tileview/x PEK2 .Screen/x DEO2
536
+	.tileview/y LDZ2 #003f ADD2 .Screen/y DEO2
537
+	.tileview/x LDZ2 .Screen/x DEO2
538 538
 	&line-hor
539 539
 		( draw ) #03 .Screen/color DEO
540 540
 		( incr ) .Screen/x DEI2 #0002 ADD2 .Screen/x DEO2
541
-	.Screen/x DEI2 .tileview/x PEK2 #0082 ADD2 LTH2 ,&line-hor JCN
541
+	.Screen/x DEI2 .tileview/x LDZ2 #0082 ADD2 LTH2 ,&line-hor JCN
542 542
 
543 543
 	( line ver )
544
-	.tileview/y PEK2 .Screen/y DEO2
545
-	.tileview/x PEK2 #003f ADD2 .Screen/x DEO2
544
+	.tileview/y LDZ2 .Screen/y DEO2
545
+	.tileview/x LDZ2 #003f ADD2 .Screen/x DEO2
546 546
 	&line-ver
547 547
 		( draw ) #03 .Screen/color DEO
548 548
 		( incr ) .Screen/y DEI2 #0002 ADD2 .Screen/y DEO2
549
-	.Screen/y DEI2 .tileview/y PEK2 #0081 ADD2 LTH2 ,&line-ver JCN
549
+	.Screen/y DEI2 .tileview/y LDZ2 #0081 ADD2 LTH2 ,&line-ver JCN
550 550
 
551
-	( rewind ) .settings/tile PEK2 #0018 SUB2 .settings/tile POK2
551
+	( rewind ) .settings/tile LDZ2 #0018 SUB2 .settings/tile STZ2
552 552
 
553 553
 RTN
554 554
 
555 555
 @draw-editview ( -- )
556 556
 
557
-	.editview/x1 PEK2 #0002 SUB2 .editview/y1 PEK2 #0002 SUB2 .editview/x2 PEK2 #0001 ADD2 .editview/y2 PEK2 #0001 ADD2 #03 ;line-rect JSR2
557
+	.editview/x1 LDZ2 #0002 SUB2 .editview/y1 LDZ2 #0002 SUB2 .editview/x2 LDZ2 #0001 ADD2 .editview/y2 LDZ2 #0001 ADD2 #03 ;line-rect JSR2
558 558
 
559 559
 	( position )
560 560
 
561
-	.editview/x1 PEK2 .Screen/x DEO2
562
-	.editview/y1 PEK2 #0010 SUB2 .Screen/y DEO2
563
-	.settings/tile PEK2 #22 ;draw-short JSR2
561
+	.editview/x1 LDZ2 .Screen/x DEO2
562
+	.editview/y1 LDZ2 #0010 SUB2 .Screen/y DEO2
563
+	.settings/tile LDZ2 #22 ;draw-short JSR2
564 564
 
565 565
 	( tiles )
566
-	.settings/tile PEK2 DUP2 STH2 .Screen/addr DEO2
566
+	.settings/tile LDZ2 DUP2 STH2 .Screen/addr DEO2
567 567
 	#00 #04
568 568
 	&ver
569
-		OVR #08 MUL TOS #0004 MUL2 .editview/y1 PEK2 ADD2 .Screen/y DEO2
569
+		OVR #08 MUL TOS #0004 MUL2 .editview/y1 LDZ2 ADD2 .Screen/y DEO2
570 570
 		#00 #04
571 571
 		&hor
572
-			OVR #08 MUL TOS #0004 MUL2 .editview/x1 PEK2 ADD2 .Screen/x DEO2
572
+			OVR #08 MUL TOS #0004 MUL2 .editview/x1 LDZ2 ADD2 .Screen/x DEO2
573 573
 			( get x,y )
574 574
 			SWP2 OVR STH SWP2 OVR STHr
575 575
 			( check if within ratio )
576
-			.settings/ratio PEK #0f AND LTH STH
577
-			.settings/ratio PEK #04 SFT LTH STHr
576
+			.settings/ratio LDZ #0f AND LTH STH
577
+			.settings/ratio LDZ #04 SFT LTH STHr
578 578
 			#0101 NEQ2 ,&outside JCN 
579 579
 
580 580
 				( get tile ) DUP2r STH2r .Screen/addr DEO2
... ...
@@ -598,12 +598,12 @@ RTN
598 598
 	POP2r
599 599
 
600 600
 	( grid )
601
-	.editview/x1 PEK2 DUP2 #0080 ADD2 .editview/y1 PEK2 #0020 ADD2 #03 ;line-hor JSR2
602
-	.editview/x1 PEK2 DUP2 #0080 ADD2 .editview/y1 PEK2 #0040 ADD2 #03 ;line-hor JSR2
603
-	.editview/x1 PEK2 DUP2 #0080 ADD2 .editview/y1 PEK2 #0060 ADD2 #03 ;line-hor JSR2
604
-	.editview/x1 PEK2 #0020 ADD2 .editview/y1 PEK2 DUP2 #0080 ADD2 #03 ;line-ver JSR2
605
-	.editview/x1 PEK2 #0040 ADD2 .editview/y1 PEK2 DUP2 #0080 ADD2 #03 ;line-ver JSR2
606
-	.editview/x1 PEK2 #0060 ADD2 .editview/y1 PEK2 DUP2 #0080 ADD2 #03 ;line-ver JSR2
601
+	.editview/x1 LDZ2 DUP2 #0080 ADD2 .editview/y1 LDZ2 #0020 ADD2 #03 ;line-hor JSR2
602
+	.editview/x1 LDZ2 DUP2 #0080 ADD2 .editview/y1 LDZ2 #0040 ADD2 #03 ;line-hor JSR2
603
+	.editview/x1 LDZ2 DUP2 #0080 ADD2 .editview/y1 LDZ2 #0060 ADD2 #03 ;line-hor JSR2
604
+	.editview/x1 LDZ2 #0020 ADD2 .editview/y1 LDZ2 DUP2 #0080 ADD2 #03 ;line-ver JSR2
605
+	.editview/x1 LDZ2 #0040 ADD2 .editview/y1 LDZ2 DUP2 #0080 ADD2 #03 ;line-ver JSR2
606
+	.editview/x1 LDZ2 #0060 ADD2 .editview/y1 LDZ2 DUP2 #0080 ADD2 #03 ;line-ver JSR2
607 607
 
608 608
 RTN
609 609
 
... ...
@@ -651,44 +651,44 @@ RTN
651 651
 
652 652
 @draw-tileview-icn ( -- )
653 653
 
654
-	#00 .pt/x POK #00 .pt/y POK
654
+	#00 .pt/x STZ #00 .pt/y STZ
655 655
 	&ver
656
-		#00 .pt/x POK
656
+		#00 .pt/x STZ
657 657
 		&hor
658 658
 			( get bit )
659 659
 			;blank_icn #00
660
-			.settings/tile PEK2 #00 .pt/y PEK ADD2 LDA #07 .pt/x PEK SUB SFT #01 AND ( get bit )
660
+			.settings/tile LDZ2 #00 .pt/y LDZ ADD2 LDA #07 .pt/x LDZ SUB SFT #01 AND ( get bit )
661 661
 			#0008 MUL2 ADD2 .Screen/addr DEO2 ( add *8 )
662 662
 			( draw ) #21 .Screen/color DEO
663 663
 			( incr ) .Screen/x DEI2 #0008 ADD2 .Screen/x DEO2
664
-			( incr ) .pt/x PEK #01 ADD .pt/x POK
665
-			.pt/x PEK #08 LTH ;&hor JCN2
664
+			( incr ) .pt/x LDZ #01 ADD .pt/x STZ
665
+			.pt/x LDZ #08 LTH ;&hor JCN2
666 666
 		( incr ) .Screen/y DEI2 #0008 ADD2 .Screen/y DEO2
667
-		( incr ) .pt/y PEK #01 ADD .pt/y POK
667
+		( incr ) .pt/y LDZ #01 ADD .pt/y STZ
668 668
 		.Screen/x DEI2 #0040 SUB2 .Screen/x DEO2
669
-		.pt/y PEK #08 LTH ;&ver JCN2
669
+		.pt/y LDZ #08 LTH ;&ver JCN2
670 670
 
671 671
 RTN
672 672
 
673 673
 @draw-blendview ( -- )
674 674
 	
675
-	( .blendview/x1 PEK2 #0002 SUB2 .blendview/y1 PEK2 #0002 SUB2 .blendview/x2 PEK2 #0001 ADD2 .blendview/y2 PEK2 #0001 ADD2 #03 ;line-rect JSR2 )
675
+	( .blendview/x1 LDZ2 #0002 SUB2 .blendview/y1 LDZ2 #0002 SUB2 .blendview/x2 LDZ2 #0001 ADD2 .blendview/y2 LDZ2 #0001 ADD2 #03 ;line-rect JSR2 )
676 676
 
677
-	.settings/tile PEK2 .Screen/addr DEO2
677
+	.settings/tile LDZ2 .Screen/addr DEO2
678 678
 	#00 #10
679 679
 	&loop
680
-		OVR #04 MOD #00 SWP #0008 MUL2 .blendview/x1 PEK2 ADD2 .Screen/x DEO2
681
-		OVR #04 DIV #00 SWP #0008 MUL2 .blendview/y1 PEK2 ADD2 .Screen/y DEO2
680
+		OVR #04 MOD #00 SWP #0008 MUL2 .blendview/x1 LDZ2 ADD2 .Screen/x DEO2
681
+		OVR #04 DIV #00 SWP #0008 MUL2 .blendview/y1 LDZ2 ADD2 .Screen/y DEO2
682 682
 		#20 .Screen/color DEO
683
-		OVR #20 ADD .settings/depth PEK #20 MUL ADD .Screen/color DEO
683
+		OVR #20 ADD .settings/depth LDZ #20 MUL ADD .Screen/color DEO
684 684
 		SWP #01 ADD SWP
685 685
 		DUP2 LTH ,&loop JCN
686 686
 	POP2
687 687
 
688
-	.blendview/x1 PEK2 .Screen/x DEO2
689
-	.blendview/y2 PEK2 #0001 ADD2 .Screen/y DEO2
690
-	( get blending ) .settings/blending PEK
691
-	( get depth ) .settings/depth PEK #20 MUL
688
+	.blendview/x1 LDZ2 .Screen/x DEO2
689
+	.blendview/y2 LDZ2 #0001 ADD2 .Screen/y DEO2
690
+	( get blending ) .settings/blending LDZ
691
+	( get depth ) .settings/depth LDZ #20 MUL
692 692
 	( draw ) #20 ADD ADD #21 ;draw-byte JSR2
693 693
 
694 694
 RTN
... ...
@@ -697,14 +697,14 @@ RTN
697 697
 
698 698
 	( bytes )
699 699
 
700
-	.tileview/y PEK2 #0018 ADD2 .Screen/y DEO2
701
-	#00 .i POK
700
+	.tileview/y LDZ2 #0018 ADD2 .Screen/y DEO2
701
+	#00 .i STZ
702 702
 	&bytes
703
-		.tileview/x PEK2 #0088 ADD2 .Screen/x DEO2
704
-		.settings/tile PEK2 #00 .i PEK ADD2 LDA #22 ;draw-byte JSR2
705
-		( incr ) .i PEK #01 ADD .i POK
703
+		.tileview/x LDZ2 #0088 ADD2 .Screen/x DEO2
704
+		.settings/tile LDZ2 #00 .i LDZ ADD2 LDA #22 ;draw-byte JSR2
705
+		( incr ) .i LDZ #01 ADD .i STZ
706 706
 		( incr ) .Screen/y DEI2 #0008 ADD2 .Screen/y DEO2
707
-	.i PEK #08 LTH ;&bytes JCN2
707
+	.i LDZ #08 LTH ;&bytes JCN2
708 708
 
709 709
 	( operations )
710 710
 
... ...
@@ -716,43 +716,43 @@ RTN
716 716
 	#21 .Screen/color DEO
717 717
 
718 718
 	( draw tiles 2x2 )
719
-	.tileview/y PEK2 .Screen/y DEO2
720
-	#00 .pt/x POK #00 .pt/y POK .settings/tile PEK2 .Screen/addr DEO2
719
+	.tileview/y LDZ2 .Screen/y DEO2
720
+	#00 .pt/x STZ #00 .pt/y STZ .settings/tile LDZ2 .Screen/addr DEO2
721 721
 
722 722
 	&tiles-ver
723
-		#00 .pt/x POK
724
-		.tileview/x PEK2 #0088 ADD2 .Screen/x DEO2
723
+		#00 .pt/x STZ
724
+		.tileview/x LDZ2 #0088 ADD2 .Screen/x DEO2
725 725
 		&tiles-hor
726 726
 			( draw ) #23 .Screen/color DEO
727 727
 			( incr ) .Screen/x DEI2 #0008 ADD2 .Screen/x DEO2
728 728
 			( incr ) .Screen/addr DEI2 #0008 ADD2 .Screen/addr DEO2
729
-			( incr ) .pt/x PEK #01 ADD .pt/x POK
730
-			.pt/x PEK #02 LTH ;&tiles-hor JCN2
731
-		( incr ) .pt/y PEK #01 ADD .pt/y POK
729
+			( incr ) .pt/x LDZ #01 ADD .pt/x STZ
730
+			.pt/x LDZ #02 LTH ;&tiles-hor JCN2
731
+		( incr ) .pt/y LDZ #01 ADD .pt/y STZ
732 732
 		( incr ) .Screen/y DEI2 #0008 ADD2 .Screen/y DEO2
733
-		.pt/y PEK #02 LTH ;&tiles-ver JCN2
733
+		.pt/y LDZ #02 LTH ;&tiles-ver JCN2
734 734
 
735 735
 RTN
736 736
 
737 737
 @draw-colorview ( -- )
738 738
 
739
-	.colorview/y1 PEK2 #18 ADD .Screen/y DEO2
740
-	.colorview/x1 PEK2 #08 ADD .Screen/x DEO2
739
+	.colorview/y1 LDZ2 #18 ADD .Screen/y DEO2
740
+	.colorview/x1 LDZ2 #08 ADD .Screen/x DEO2
741 741
 	.System/r DEI2 ;draw-color-code JSR2
742
-	.colorview/y1 PEK2 #18 ADD .Screen/y DEO2
743
-	.colorview/x1 PEK2 #10 ADD .Screen/x DEO2
742
+	.colorview/y1 LDZ2 #18 ADD .Screen/y DEO2
743
+	.colorview/x1 LDZ2 #10 ADD .Screen/x DEO2
744 744
 	.System/g DEI2 ;draw-color-code JSR2
745
-	.colorview/y1 PEK2 #18 ADD .Screen/y DEO2
746
-	.colorview/x1 PEK2 #18 ADD .Screen/x DEO2
745
+	.colorview/y1 LDZ2 #18 ADD .Screen/y DEO2
746
+	.colorview/x1 LDZ2 #18 ADD .Screen/x DEO2
747 747
 	.System/b DEI2 ;draw-color-code JSR2	
748 748
 
749
-	.colorview/x1 PEK2 .Screen/x DEO2
749
+	.colorview/x1 LDZ2 .Screen/x DEO2
750 750
 	;circle_icns .Screen/addr DEO2
751 751
 
752 752
 	#00 #04
753 753
 	&loop
754
-		OVR .settings/brush PEK EQU #00 SWP #0008 MUL2 ;circle_icns ADD2 .Screen/addr DEO2
755
-		OVR .colorview/y1 PEK2 ROT #00 SWP #0008 MUL2 ADD2 .Screen/y DEO2
754
+		OVR .settings/brush LDZ EQU #00 SWP #0008 MUL2 ;circle_icns ADD2 .Screen/addr DEO2
755
+		OVR .colorview/y1 LDZ2 ROT #00 SWP #0008 MUL2 ADD2 .Screen/y DEO2
756 756
 		OVR #20 ADD .Screen/color DEO
757 757
 		SWP #01 ADD SWP
758 758
 		DUP2 LTH ,&loop JCN
... ...
@@ -763,24 +763,24 @@ RTN
763 763
 @draw-preview ( -- )
764 764
 
765 765
 	( stash address )
766
-	.settings/tile PEK2 DUP2 STH2 .Screen/addr DEO2
766
+	.settings/tile LDZ2 DUP2 STH2 .Screen/addr DEO2
767 767
 	#00 #04
768 768
 	&ver
769
-		OVR #08 MUL TOS .preview/y1 PEK2 ADD2 .Screen/y DEO2
769
+		OVR #08 MUL TOS .preview/y1 LDZ2 ADD2 .Screen/y DEO2
770 770
 		#00 #04
771 771
 		&hor
772
-			OVR #08 MUL TOS .preview/x1 PEK2 ADD2 .Screen/x DEO2
772
+			OVR #08 MUL TOS .preview/x1 LDZ2 ADD2 .Screen/x DEO2
773 773
 			( get x,y )
774 774
 			SWP2 OVR STH SWP2 OVR STHr
775 775
 			( check if within ratio )
776
-			.settings/ratio PEK #0f AND LTH STH
777
-			.settings/ratio PEK #04 SFT LTH STHr
776
+			.settings/ratio LDZ #0f AND LTH STH
777
+			.settings/ratio LDZ #04 SFT LTH STHr
778 778
 			#0101 NEQ2 ,&outside JCN 
779 779
 				( get tile ) DUP2r STH2r .Screen/addr DEO2
780
-				( get blending ) .settings/blending PEK
781
-				( get depth ) .settings/depth PEK #20 MUL
780
+				( get blending ) .settings/blending LDZ
781
+				( get depth ) .settings/depth LDZ #20 MUL
782 782
 				( draw ) #20 ADD ADD .Screen/color DEO
783
-				( incr ) STH2r #0008 [ .settings/depth PEK #08 MUL TOS ADD2 ] ADD2 STH2
783
+				( incr ) STH2r #0008 [ .settings/depth LDZ #08 MUL TOS ADD2 ] ADD2 STH2
784 784
 				,&resume JMP
785 785
 			&outside
786 786
 			;halftone_icn .Screen/addr DEO2
... ...
@@ -793,9 +793,9 @@ RTN
793 793
 		DUP2 LTH ;&ver JCN2
794 794
 	POP2
795 795
 	POP2r
796
-	.preview/x1 PEK2 #0001 SUB2 .Screen/x DEO2
797
-	.preview/y2 PEK2 #0001 ADD2 .Screen/y DEO2
798
-	.settings/ratio PEK #23 ;draw-byte JSR2
796
+	.preview/x1 LDZ2 #0001 SUB2 .Screen/x DEO2
797
+	.preview/y2 LDZ2 #0001 ADD2 .Screen/y DEO2
798
+	.settings/ratio LDZ #23 ;draw-byte JSR2
799 799
 
800 800
 RTN
801 801
 
... ...
@@ -803,13 +803,13 @@ RTN
803 803
 	
804 804
 	DUP ;font-hex ROT #0f AND #08 MUL #00 SWP ADD2 .Screen/addr DEO2
805 805
 	( draw ) #22 .Screen/color DEO
806
-	.colorview/y1 PEK2 #10 ADD .Screen/y DEO2
806
+	.colorview/y1 LDZ2 #10 ADD .Screen/y DEO2
807 807
 	;font-hex ROT #04 SFT #08 MUL #00 SWP ADD2 .Screen/addr DEO2
808 808
 	( draw ) #22 .Screen/color DEO
809
-	.colorview/y1 PEK2 #08 ADD .Screen/y DEO2
809
+	.colorview/y1 LDZ2 #08 ADD .Screen/y DEO2
810 810
 	DUP ;font-hex ROT #0f AND #08 MUL #00 SWP ADD2 .Screen/addr DEO2
811 811
 	( draw ) #22 .Screen/color DEO
812
-	.colorview/y1 PEK2 .Screen/y DEO2
812
+	.colorview/y1 LDZ2 .Screen/y DEO2
813 813
 	;font-hex ROT #04 SFT #08 MUL #00 SWP ADD2 .Screen/addr DEO2
814 814
 	( draw ) #22 .Screen/color DEO
815 815
 
... ...
@@ -818,30 +818,30 @@ RTN
818 818
 @draw-cursor ( -- )
819 819
 
820 820
 	( clear last cursor )
821
-	.mouse/x PEK2 .Screen/x DEO2
822
-	.mouse/y PEK2 .Screen/y DEO2
821
+	.mouse/x LDZ2 .Screen/x DEO2
822
+	.mouse/y LDZ2 .Screen/y DEO2
823 823
 	#30 .Screen/color DEO
824 824
 
825 825
 	( record mouse positions )
826
-	.Mouse/x DEI2 .mouse/x POK2
827
-	.Mouse/y DEI2 .mouse/y POK2
826
+	.Mouse/x DEI2 .mouse/x STZ2
827
+	.Mouse/y DEI2 .mouse/y STZ2
828 828
 
829 829
 	( draw new cursor )
830
-	.mouse/x PEK2 .Screen/x DEO2
831
-	.mouse/y PEK2 .Screen/y DEO2
832
-	;tool_selector #00 .bankview/mode PEK #08 MUL ADD2 .Screen/addr DEO2
830
+	.mouse/x LDZ2 .Screen/x DEO2
831
+	.mouse/y LDZ2 .Screen/y DEO2
832
+	;tool_selector #00 .bankview/mode LDZ #08 MUL ADD2 .Screen/addr DEO2
833 833
 	#32 .Mouse/state DEI #00 NEQ ADD .Screen/color DEO
834 834
 
835 835
 RTN
836 836
 
837 837
 @draw-byte ( byte color -- )
838 838
 	
839
-	.color POK STH
839
+	.color STZ STH
840 840
 	;font-hex #00 DUPr STHr #f0 AND #04 SFT #08 MUL ADD2 .Screen/addr DEO2
841
-	( draw ) .color PEK .Screen/color DEO
841
+	( draw ) .color LDZ .Screen/color DEO
842 842
 	.Screen/x DEI2 #0008 ADD2 .Screen/x DEO2
843 843
 	;font-hex #00 STHr #0f AND #08 MUL ADD2 .Screen/addr DEO2
844
-	( draw ) .color PEK .Screen/color DEO
844
+	( draw ) .color LDZ .Screen/color DEO
845 845
 
846 846
 RTN
847 847
 
... ...
@@ -866,20 +866,20 @@ RTN
866 866
 
867 867
 @line-rect ( x1* y1* x2* y2* color -- )
868 868
 
869
-	( load ) .color POK DUP2 STH2 .rect/y2 POK2 .rect/x2 POK2 DUP2 STH2 .rect/y1 POK2 .rect/x1 POK2
869
+	( load ) .color STZ DUP2 STH2 .rect/y2 STZ2 .rect/x2 STZ2 DUP2 STH2 .rect/y1 STZ2 .rect/x1 STZ2
870 870
 	STH2r STH2r
871 871
 	&ver
872 872
 		( save ) OVR2 .Screen/y DEO2
873
-		( draw ) .rect/x1 PEK2 .Screen/x DEO2 .color PEK DUP .Screen/color DEO
874
-		( draw ) .rect/x2 PEK2 .Screen/x DEO2 .Screen/color DEO
873
+		( draw ) .rect/x1 LDZ2 .Screen/x DEO2 .color LDZ DUP .Screen/color DEO
874
+		( draw ) .rect/x2 LDZ2 .Screen/x DEO2 .Screen/color DEO
875 875
 		( incr ) SWP2 #0001 ADD2 SWP2
876 876
 		OVR2 OVR2 LTS2 ,&ver JCN
877 877
 	POP2 POP2
878
-	.rect/x1 PEK2 .rect/x2 PEK2
878
+	.rect/x1 LDZ2 .rect/x2 LDZ2
879 879
 	&hor
880 880
 		( save ) OVR2 .Screen/x DEO2
881
-		( draw ) .rect/y1 PEK2 .Screen/y DEO2 .color PEK DUP .Screen/color DEO
882
-		( draw ) .rect/y2 PEK2 .Screen/y DEO2 .Screen/color DEO
881
+		( draw ) .rect/y1 LDZ2 .Screen/y DEO2 .color LDZ DUP .Screen/color DEO
882
+		( draw ) .rect/y2 LDZ2 .Screen/y DEO2 .Screen/color DEO
883 883
 		( incr ) SWP2 #0001 ADD2 SWP2
884 884
 		OVR2 OVR2 #0001 ADD2 LTS2 ,&hor JCN
885 885
 	POP2 POP2
... ...
@@ -32,55 +32,55 @@
32 32
 
33 33
 	( theme )  #03fd .System/r DEO2 #0ef3 .System/g DEO2 #0bf2 .System/b DEO2
34 34
 	( vectors )  ;on-screen .Screen/vector DEO2
35
-	#01 .fps/current POK
35
+	#01 .fps/current STZ
36 36
 
37 37
 	#000c
38
-	DUP2 .lines/x1 POK2
39
-	DUP2 .lines/y1 POK2
40
-	DUP2 .Screen/width DEI2 SWP2 SUB2 #0001 SUB2 .lines/x2 POK2
41
-	     .Screen/height DEI2 SWP2 SUB2 .lines/y2 POK2
42
-
43
-	#02 .neralie/color POK
44
-	.lines/x1 PEK2 .lines/x2 PEK2
45
-	OVR2 OVR2 .lines/y1 PEK2 ;h JSR2
46
-	          .lines/y2 PEK2 ;h JSR2
47
-	.lines/y1 PEK2 #0001 SUB2 .lines/y2 PEK2 #0001 ADD2
48
-	OVR2 OVR2 .lines/x1 PEK2 ;v JSR2
49
-	          .lines/x2 PEK2 ;v JSR2
38
+	DUP2 .lines/x1 STZ2
39
+	DUP2 .lines/y1 STZ2
40
+	DUP2 .Screen/width DEI2 SWP2 SUB2 #0001 SUB2 .lines/x2 STZ2
41
+	     .Screen/height DEI2 SWP2 SUB2 .lines/y2 STZ2
42
+
43
+	#02 .neralie/color STZ
44
+	.lines/x1 LDZ2 .lines/x2 LDZ2
45
+	OVR2 OVR2 .lines/y1 LDZ2 ;h JSR2
46
+	          .lines/y2 LDZ2 ;h JSR2
47
+	.lines/y1 LDZ2 #0001 SUB2 .lines/y2 LDZ2 #0001 ADD2
48
+	OVR2 OVR2 .lines/x1 LDZ2 ;v JSR2
49
+	          .lines/x2 LDZ2 ;v JSR2
50 50
 
51 51
 @on-screen
52 52
 	;update-fps JSR2
53
-	#00 .neralie/color POK
53
+	#00 .neralie/color STZ
54 54
 	;neralie-lines JSR2
55 55
 	;neralie-calc JSR2
56
-	#02 .neralie/color POK
56
+	#02 .neralie/color STZ
57 57
 	;arvelie-text JSR2
58 58
 	;neralie-text JSR2
59 59
 	;neralie-lines JSR2
60 60
 	BRK
61 61
 
62 62
 	#22 .Screen/color DEO
63
-	#0000 #00 .number/count PEK DUP2 ;h JSR2
64
-	.number/count PEK #01 ADD .number/count POK
63
+	#0000 #00 .number/count LDZ DUP2 ;h JSR2
64
+	.number/count LDZ #01 ADD .number/count STZ
65 65
 
66 66
 @neralie-calc ( -- )
67 67
 	( add up fractions of a pulse, store tenths in n6 )
68 68
 	#0120 #00 h MUL2
69 69
 	#00c0 #00 m MUL2 ADD2
70 70
 	#00f8 #00 s MUL2 ADD2
71
-	#0271 #00 .fps/next PEK MUL2 #00 .fps/current PEK DIV2 #0008 MUL2 ADD2
72
-	#01b0 ;modf JSR2 SWP2 #0017 MUL2 #03e8 DIV2 .neralie/n6 POK POP
71
+	#0271 #00 .fps/next LDZ MUL2 #00 .fps/current LDZ DIV2 #0008 MUL2 ADD2
72
+	#01b0 ;modf JSR2 SWP2 #0017 MUL2 #03e8 DIV2 .neralie/n6 STZ POP
73 73
 
74 74
 	( add up units and tens of pulses, store in n5 and n4 )
75 75
 	#0042 #00 h MUL2 ADD2
76 76
 	#005e #00 m MUL2 ADD2
77 77
 	#000b #00 s MUL2 ADD2
78
-	#000a ;modf JSR2 SWP2 .neralie/n5 POK POP
79
-	#000a ;modf JSR2 SWP2 .neralie/n4 POK POP
78
+	#000a ;modf JSR2 SWP2 .neralie/n5 STZ POP
79
+	#000a ;modf JSR2 SWP2 .neralie/n4 STZ POP
80 80
 
81 81
 	( add up hundreds of pulses + 10 x beats, store in n0123 )
82 82
 	#01a0 #00 h MUL2 ADD2
83
-	#0006 #00 m MUL2 ADD2 .neralie/n0123 POK2
83
+	#0006 #00 m MUL2 ADD2 .neralie/n0123 STZ2
84 84
 
85 85
 	JMP2r
86 86
 
... ...
@@ -98,14 +98,14 @@
98 98
 
99 99
 @neralie-text ( -- )
100 100
 	.Screen/width DEI2 #0002 DIV2 #0004 SUB2 .Screen/x DEO2
101
-	.neralie/n0123 PEK2
101
+	.neralie/n0123 LDZ2
102 102
 	#03e8 ;modf JSR2 ,digit JSR
103 103
 	#0064 ;modf JSR2 ,digit JSR
104 104
 	#000a ;modf JSR2 ,digit JSR
105 105
 	           #000b ,digit JSR ( the colon )
106 106
 	                 ,digit JSR
107
-	#00 .neralie/n4 PEK  ,digit JSR
108
-	#00 .neralie/n5 PEK  ,digit JSR
107
+	#00 .neralie/n4 LDZ  ,digit JSR
108
+	#00 .neralie/n5 LDZ  ,digit JSR
109 109
 	JMP2r
110 110
 
111 111
 @letter ( index* -- )
... ...
@@ -115,24 +115,24 @@
115 115
 @digit ( index* -- )
116 116
 	#0008 MUL2 ;font-numbers ADD2 .Screen/addr DEO2
117 117
 	&middle
118
-	.neralie/color PEK #20 ADD .Screen/color DEO
118
+	.neralie/color LDZ #20 ADD .Screen/color DEO
119 119
 	.Screen/x DEI2 #0008 ADD2 .Screen/x DEO2
120 120
 	JMP2r
121 121
 
122 122
 @neralie-lines ( -- )
123
-	.lines/x2 PEK2 .lines/x1 PEK2 DUP2 .neralie/x POK2 SUB2 .neralie/w POK2
124
-	.lines/y2 PEK2 .lines/y1 PEK2 DUP2 .neralie/y POK2 SUB2 .neralie/h POK2
123
+	.lines/x2 LDZ2 .lines/x1 LDZ2 DUP2 .neralie/x STZ2 SUB2 .neralie/w STZ2
124
+	.lines/y2 LDZ2 .lines/y1 LDZ2 DUP2 .neralie/y STZ2 SUB2 .neralie/h STZ2
125 125
 
126
-	;neralie/n4 SWP POP .neralie/n0123 PEK2
126
+	;neralie/n4 SWP POP .neralie/n0123 LDZ2
127 127
 	DUP2 ;&h JSR2
128
-	;&next JSR2 #0001 .Screen/x DEO2 .neralie/y PEK2 #0003 SUB2 .Screen/y DEO2 ,digit JSR
128
+	;&next JSR2 #0001 .Screen/x DEO2 .neralie/y LDZ2 #0003 SUB2 .Screen/y DEO2 ,digit JSR
129 129
 	DUP2 ;&v JSR2
130 130
 	#04 ;v/spacing STA
131
-	.lines/y1 PEK2 #0003 SUB2 .neralie/y PEK2 .neralie/x PEK2 ;v JSR2
131
+	.lines/y1 LDZ2 #0003 SUB2 .neralie/y LDZ2 .neralie/x LDZ2 ;v JSR2
132 132
 	#01 ;v/spacing STA
133
-	,&next JSR #0001 .Screen/y DEO2 .neralie/x PEK2 #0003 SUB2 .Screen/x DEO2 ;digit JSR2
133
+	,&next JSR #0001 .Screen/y DEO2 .neralie/x LDZ2 #0003 SUB2 .Screen/x DEO2 ;digit JSR2
134 134
 	DUP2 ,&h JSR
135
-	,&next JSR .Screen/width DEI2 #0009 SUB2 .Screen/x DEO2 .neralie/y PEK2 #0003 SUB2 .Screen/y DEO2 ;digit JSR2
135
+	,&next JSR .Screen/width DEI2 #0009 SUB2 .Screen/x DEO2 .neralie/y LDZ2 #0003 SUB2 .Screen/y DEO2 ;digit JSR2
136 136
 	DUP2 ,&v JSR
137 137
 	,&next JSR POP2
138 138
 	DUP2 ,&h JSR
... ...
@@ -144,25 +144,25 @@
144 144
 	&next ( digit-addr number* -- next-digit-addr next-number* prev-digit* )
145 145
 	#03e8 ;modf JSR2 STH2 #000a MUL2
146 146
 	ROT DUP STH #01 ADD ROT ROT
147
-	#00 STHr PEK ADD2
147
+	#00 STHr LDZ ADD2
148 148
 	STH2r
149 149
 	JMP2r
150 150
 
151 151
 	&h ( number* -- )
152 152
 	,scale JSR
153
-	.neralie/h PEK2 ;mul2hi JSR2
153
+	.neralie/h LDZ2 ;mul2hi JSR2
154 154
 	DUP2 #0000 NEQ2 #02 JCN POP2 JMP2r
155
-	DUP2 .neralie/y PEK2 ADD2 .neralie/y POK2
156
-	.neralie/h PEK2 SWP2 SUB2 .neralie/h POK2
157
-	.neralie/x PEK2 DUP2 .neralie/w PEK2 ADD2 .neralie/y PEK2 ,h JMP
155
+	DUP2 .neralie/y LDZ2 ADD2 .neralie/y STZ2
156
+	.neralie/h LDZ2 SWP2 SUB2 .neralie/h STZ2
157
+	.neralie/x LDZ2 DUP2 .neralie/w LDZ2 ADD2 .neralie/y LDZ2 ,h JMP
158 158
 
159 159
 	&v ( number* -- )
160 160
 	,scale JSR
161
-	.neralie/w PEK2 ;mul2hi JSR2
161
+	.neralie/w LDZ2 ;mul2hi JSR2
162 162
 	DUP2 #0000 NEQ2 #02 JCN POP2 JMP2r
163
-	DUP2 .neralie/x PEK2 ADD2 .neralie/x POK2
164
-	.neralie/w PEK2 SWP2 SUB2 .neralie/w POK2
165
-	.neralie/y PEK2 DUP2 .neralie/h PEK2 ADD2 .neralie/x PEK2 ,v JMP
163
+	DUP2 .neralie/x LDZ2 ADD2 .neralie/x STZ2
164
+	.neralie/w LDZ2 SWP2 SUB2 .neralie/w STZ2
165
+	.neralie/y LDZ2 DUP2 .neralie/h LDZ2 ADD2 .neralie/x LDZ2 ,v JMP
166 166
 
167 167
 @scale ( 0..10000* -- 0..65535* )
168 168
 	DUP2 #8db8 ;mul2hi JSR2
... ...
@@ -171,12 +171,12 @@
171 171
 
172 172
 @h ( x1* x2* y* -- )
173 173
 	.Screen/y DEO2
174
-	.Screen/x .lines/addr POK
174
+	.Screen/x .lines/addr STZ
175 175
 	,v/draw-line JMP
176 176
 
177 177
 @v ( y1* y2* x* -- )
178 178
 	.Screen/x DEO2
179
-	.Screen/y .lines/addr POK
179
+	.Screen/y .lines/addr STZ
180 180
 
181 181
 	&draw-line ( v1* v2* -- )
182 182
 	OVR2 OVR2 LTH2 #01 JCN SWP2
... ...
@@ -189,20 +189,20 @@
189 189
 	JMP2r
190 190
 
191 191
 	&keep-going
192
-	DUP2 .lines/addr PEK DEO2
193
-	.neralie/color PEK .Screen/color DEO
192
+	DUP2 .lines/addr LDZ DEO2
193
+	.neralie/color LDZ .Screen/color DEO
194 194
 	,&loop JMP
195 195
 
196 196
 @update-fps ( -- )
197
-	.fps/next PEK #01 ADD .fps/next POK
198
-	s .fps/second PEK NEQ JMP JMP2r
199
-	s .fps/second POK
200
-	.fps/next PEK .fps/current POK
197
+	.fps/next LDZ #01 ADD .fps/next STZ
198
+	s .fps/second LDZ NEQ JMP JMP2r
199
+	s .fps/second STZ
200
+	.fps/next LDZ .fps/current STZ
201 201
 
202 202
 	( ~fps.next ^print-byte-decimal JSR
203 203
 	,strings-fps ^print-string JSR )
204 204
 
205
-	#00 .fps/next POK
205
+	#00 .fps/next STZ
206 206
 	JMP2r
207 207
 
208 208
 @modf ( dividend* divisor* -- remainder* quotient* )
... ...
@@ -229,12 +229,12 @@
229 229
 	;mul/bhi STA2 ;mul/ahi STA2
230 230
 	#00
231 231
 		#00
232
-			#00 .mul/alo PEK #00 .mul/blo PEK MUL2
232
+			#00 .mul/alo LDZ #00 .mul/blo LDZ MUL2
233 233
 		POP
234
-		#00 .mul/ahi PEK #00 .mul/blo PEK MUL2 ,&adc JSR
235
-		#00 .mul/alo PEK #00 .mul/bhi PEK MUL2 ,&adc JSR
234
+		#00 .mul/ahi LDZ #00 .mul/blo LDZ MUL2 ,&adc JSR
235
+		#00 .mul/alo LDZ #00 .mul/bhi LDZ MUL2 ,&adc JSR
236 236
 	POP
237
-	#00 .mul/ahi PEK #00 .mul/bhi PEK MUL2 ADD2
237
+	#00 .mul/ahi LDZ #00 .mul/bhi LDZ MUL2 ADD2
238 238
 	JMP2r
239 239
 
240 240
 	&adc ( 31..24 a* b* -- 31..24 sum* )
... ...
@@ -25,7 +25,7 @@
25 25
 %2/ { #0001 SFT2 }
26 26
 %8/ { #0003 SFT2 } %8* { #0030 SFT2 }
27 27
 %8+ { #0008 ADD2 }
28
-%FILESIZE { .canvas/w PEK2 .canvas/h PEK2 MUL2 #0008 MUL2 }
28
+%FILESIZE { .canvas/w LDZ2 .canvas/h LDZ2 MUL2 #0008 MUL2 }
29 29
 
30 30
 ( devices )
31 31
 
... ...
@@ -66,28 +66,28 @@
66 66
 |0100
67 67
 	
68 68
 	( theme )
69
-	#e0fa .theme/r0 POK2 #30fa .theme/g0 POK2 #30fa .theme/b0 POK2 ( normal mode )
70
-	#00fe .theme/r1 POK2 #00f3 .theme/g1 POK2 #00f3 .theme/b1 POK2 ( presentation mode )
69
+	#e0fa .theme/r0 STZ2 #30fa .theme/g0 STZ2 #30fa .theme/b0 STZ2 ( normal mode )
70
+	#00fe .theme/r1 STZ2 #00f3 .theme/g1 STZ2 #00f3 .theme/b1 STZ2 ( presentation mode )
71 71
 	( vectors ) ;on-screen .Screen/vector DEO2
72 72
 	( vectors ) ;on-button .Controller/vector DEO2
73 73
 	( vectors ) ;on-mouse .Mouse/vector DEO2
74 74
 
75
-	.theme/r0 PEK2 .System/r DEO2 .theme/g0 PEK2 .System/g DEO2 .theme/b0 PEK2 .System/b DEO2
75
+	.theme/r0 LDZ2 .System/r DEO2 .theme/g0 LDZ2 .System/g DEO2 .theme/b0 LDZ2 .System/b DEO2
76 76
 
77 77
 	( default canvas )
78
-	#002a .canvas/w POK2 #0018 .canvas/h POK2
78
+	#002a .canvas/w STZ2 #0018 .canvas/h STZ2
79 79
 
80 80
 	( default brush )
81
-	#04 .brush/size POK #00 .brush/patt POK #00 .brush/tool POK
81
+	#04 .brush/size STZ #00 .brush/patt STZ #00 .brush/tool STZ
82 82
 
83 83
 	( load file )
84 84
 	;untitled_txt ;path/name ;strcpy JSR2
85 85
 
86 86
 	( setup panes )
87
-	#0010 .toolpane/x1 POK2 #0010 .toolpane/y1 POK2 .toolpane/x1 PEK2 #0028 ADD2 .toolpane/x2 POK2 .toolpane/y1 PEK2 #0008 ADD2 .toolpane/y2 POK2
88
-	#0040 .sizepane/x1 POK2 #0010 .sizepane/y1 POK2 .sizepane/x1 PEK2 #0040 ADD2 .sizepane/x2 POK2 .sizepane/y1 PEK2 #0008 ADD2 .sizepane/y2 POK2
89
-	.Screen/width DEI2 #0078 SUB2 .viewpane/x1 POK2 #0010 .viewpane/y1 POK2 .viewpane/x1 PEK2 #0020 ADD2 .viewpane/x2 POK2 .viewpane/y1 PEK2 #0008 ADD2 .viewpane/y2 POK2
90
-	.Screen/width DEI2 #0050 SUB2 .pattpane/x1 POK2 #0010 .pattpane/y1 POK2 .pattpane/x1 PEK2 #0040 ADD2 .pattpane/x2 POK2 .pattpane/y1 PEK2 #0008 ADD2 .pattpane/y2 POK2
87
+	#0010 .toolpane/x1 STZ2 #0010 .toolpane/y1 STZ2 .toolpane/x1 LDZ2 #0028 ADD2 .toolpane/x2 STZ2 .toolpane/y1 LDZ2 #0008 ADD2 .toolpane/y2 STZ2
88
+	#0040 .sizepane/x1 STZ2 #0010 .sizepane/y1 STZ2 .sizepane/x1 LDZ2 #0040 ADD2 .sizepane/x2 STZ2 .sizepane/y1 LDZ2 #0008 ADD2 .sizepane/y2 STZ2
89
+	.Screen/width DEI2 #0078 SUB2 .viewpane/x1 STZ2 #0010 .viewpane/y1 STZ2 .viewpane/x1 LDZ2 #0020 ADD2 .viewpane/x2 STZ2 .viewpane/y1 LDZ2 #0008 ADD2 .viewpane/y2 STZ2
90
+	.Screen/width DEI2 #0050 SUB2 .pattpane/x1 STZ2 #0010 .pattpane/y1 STZ2 .pattpane/x1 LDZ2 #0040 ADD2 .pattpane/x2 STZ2 .pattpane/y1 LDZ2 #0008 ADD2 .pattpane/y2 STZ2
91 91
 
92 92
 	( ready. )
93 93
 	;center JSR2
... ...
@@ -100,15 +100,15 @@ BRK
100 100
 
101 101
 @on-screen ( -> )
102 102
 	
103
-	.document/edit PEK #01 NEQ ,&no-edit JCN
103
+	.document/edit LDZ #01 NEQ ,&no-edit JCN
104 104
 		#0008 .Screen/x DEO2
105 105
 		.Screen/height DEI2 #0010 SUB2 .Screen/y DEO2
106
-		;path/name #01 .timer PEK #04 DIV #03 AND #03 MUL ADD ;draw-label JSR2
106
+		;path/name #01 .timer LDZ #04 DIV #03 AND #03 MUL ADD ;draw-label JSR2
107 107
 		&clear
108 108
 			#20 .Screen/color DEO
109 109
 			.Screen/x DEI2 8+ DUP2 .Screen/x DEO2
110 110
 			.Screen/width DEI2 LTH2 ,&clear JCN
111
-		( blink ) .timer PEK #01 ADD .timer POK
111
+		( blink ) .timer LDZ #01 ADD .timer STZ
112 112
 	&no-edit
113 113
 
114 114
 BRK
... ...
@@ -118,32 +118,32 @@ BRK
118 118
 	;draw-cursor JSR2
119 119
 
120 120
 	( release drag )
121
-	.Mouse/state DEI #00 EQU .brush/drag PEK #01 EQU #0101 NEQ2 ,&no-release JCN
122
-		.origin/x1 PEK2 #0002 SUB2 .origin/y1 PEK2 #0002 SUB2 .origin/x2 PEK2 #0002 ADD2 .origin/y2 PEK2 #0002 ADD2 #00 ;fill-rect JSR2
123
-		.canvas/x1 PEK2 -- .canvas/y1 PEK2 -- .canvas/x2 PEK2 .canvas/y2 PEK2 #10 ;line-rect JSR2
121
+	.Mouse/state DEI #00 EQU .brush/drag LDZ #01 EQU #0101 NEQ2 ,&no-release JCN
122
+		.origin/x1 LDZ2 #0002 SUB2 .origin/y1 LDZ2 #0002 SUB2 .origin/x2 LDZ2 #0002 ADD2 .origin/y2 LDZ2 #0002 ADD2 #00 ;fill-rect JSR2
123
+		.canvas/x1 LDZ2 -- .canvas/y1 LDZ2 -- .canvas/x2 LDZ2 .canvas/y2 LDZ2 #10 ;line-rect JSR2
124 124
 		;draw-background JSR2
125 125
 		;fit-canvas JSR2
126 126
 		;draw-foreground JSR2
127
-		#00 .brush/drag POK
127
+		#00 .brush/drag STZ
128 128
 	&no-release
129 129
 
130 130
 	( operations on release line/rect )
131
-	.Mouse/state DEI .brush/last PEK EQU ;&no-touch-change JCN2
132
-	.Mouse/x DEI2 CLN2r .canvas/x1 PEK2 GTS2 STH2r .canvas/x2 PEK2 LTS2 #0101 NEQ2 ;&no-touch-change JCN2
133
-	.Mouse/y DEI2 CLN2r .canvas/y1 PEK2 GTS2 STH2r .canvas/y2 PEK2 LTS2 #0101 NEQ2 ;&no-touch-change JCN2
131
+	.Mouse/state DEI .brush/last LDZ EQU ;&no-touch-change JCN2
132
+	.Mouse/x DEI2 CLN2r .canvas/x1 LDZ2 GTS2 STH2r .canvas/x2 LDZ2 LTS2 #0101 NEQ2 ;&no-touch-change JCN2
133
+	.Mouse/y DEI2 CLN2r .canvas/y1 LDZ2 GTS2 STH2r .canvas/y2 LDZ2 LTS2 #0101 NEQ2 ;&no-touch-change JCN2
134 134
 		.Mouse/state DEI #00 EQU ,&no-touch-ondown JCN
135 135
 			( on down )
136
-			.Mouse/x DEI2 .cursor/dx POK2
137
-			.Mouse/y DEI2 .cursor/dy POK2
136
+			.Mouse/x DEI2 .cursor/dx STZ2
137
+			.Mouse/y DEI2 .cursor/dy STZ2
138 138
 		&no-touch-ondown
139 139
 		.Mouse/state DEI #00 NEQ ,&no-touch-onup JCN
140 140
 			( on up )
141
-			.brush/tool PEK #02 NEQ ,&no-touch-line JCN
142
-				.cursor/dx PEK2 .canvas/x1 PEK2 SUB2 .cursor/dy PEK2 .canvas/y1 PEK2 SUB2 .Mouse/x DEI2 .canvas/x1 PEK2 SUB2 .Mouse/y DEI2 .canvas/y1 PEK2 SUB2 ;paint-line JSR2
141
+			.brush/tool LDZ #02 NEQ ,&no-touch-line JCN
142
+				.cursor/dx LDZ2 .canvas/x1 LDZ2 SUB2 .cursor/dy LDZ2 .canvas/y1 LDZ2 SUB2 .Mouse/x DEI2 .canvas/x1 LDZ2 SUB2 .Mouse/y DEI2 .canvas/y1 LDZ2 SUB2 ;paint-line JSR2
143 143
 				;&touch-end JMP2
144 144
 			&no-touch-line
145
-			.brush/tool PEK #03 NEQ ,&no-touch-rect JCN
146
-				.cursor/dx PEK2 .canvas/x1 PEK2 SUB2 .cursor/dy PEK2 .canvas/y1 PEK2 SUB2 .Mouse/x DEI2 .canvas/x1 PEK2 SUB2 .Mouse/y DEI2 .canvas/y1 PEK2 SUB2 ;paint-rect JSR2
145
+			.brush/tool LDZ #03 NEQ ,&no-touch-rect JCN
146
+				.cursor/dx LDZ2 .canvas/x1 LDZ2 SUB2 .cursor/dy LDZ2 .canvas/y1 LDZ2 SUB2 .Mouse/x DEI2 .canvas/x1 LDZ2 SUB2 .Mouse/y DEI2 .canvas/y1 LDZ2 SUB2 ;paint-rect JSR2
147 147
 				;&touch-end JMP2
148 148
 			&no-touch-rect
149 149
 		&no-touch-onup
... ...
@@ -153,69 +153,69 @@ BRK
153 153
 
154 154
 		( drag )
155 155
 		.Controller/button DEI #02 NEQ ;&no-drag JCN2
156
-			.brush/drag PEK #00 NEQ ,&no-drag-start JCN
157
-				.canvas/x1 PEK2 .origin/x1 POK2
158
-				.canvas/y1 PEK2 .origin/y1 POK2
159
-				.canvas/x2 PEK2 .origin/x2 POK2
160
-				.canvas/y2 PEK2 .origin/y2 POK2
156
+			.brush/drag LDZ #00 NEQ ,&no-drag-start JCN
157
+				.canvas/x1 LDZ2 .origin/x1 STZ2
158
+				.canvas/y1 LDZ2 .origin/y1 STZ2
159
+				.canvas/x2 LDZ2 .origin/x2 STZ2
160
+				.canvas/y2 LDZ2 .origin/y2 STZ2
161 161
 			&no-drag-start
162
-			.canvas/x1 PEK2 -- .canvas/y1 PEK2 -- .canvas/x2 PEK2 .canvas/y2 PEK2 #10 ;line-rect JSR2
163
-			.canvas/x1 PEK2 .Mouse/x DEI2 .cursor/x0 PEK2 SUB2 ADD2 .canvas/x1 POK2
164
-			.canvas/y1 PEK2 .Mouse/y DEI2 .cursor/y0 PEK2 SUB2 ADD2 .canvas/y1 POK2
165
-			.canvas/w PEK2 8* .canvas/x1 PEK2 ADD2 .canvas/x2 POK2
166
-			.canvas/h PEK2 8* .canvas/y1 PEK2 ADD2 .canvas/y2 POK2
167
-			.canvas/x1 PEK2 -- .canvas/y1 PEK2 -- .canvas/x2 PEK2 .canvas/y2 PEK2 #13 ;line-rect JSR2
168
-			#01 .brush/drag POK
162
+			.canvas/x1 LDZ2 -- .canvas/y1 LDZ2 -- .canvas/x2 LDZ2 .canvas/y2 LDZ2 #10 ;line-rect JSR2
163
+			.canvas/x1 LDZ2 .Mouse/x DEI2 .cursor/x0 LDZ2 SUB2 ADD2 .canvas/x1 STZ2
164
+			.canvas/y1 LDZ2 .Mouse/y DEI2 .cursor/y0 LDZ2 SUB2 ADD2 .canvas/y1 STZ2
165
+			.canvas/w LDZ2 8* .canvas/x1 LDZ2 ADD2 .canvas/x2 STZ2
166
+			.canvas/h LDZ2 8* .canvas/y1 LDZ2 ADD2 .canvas/y2 STZ2
167
+			.canvas/x1 LDZ2 -- .canvas/y1 LDZ2 -- .canvas/x2 LDZ2 .canvas/y2 LDZ2 #13 ;line-rect JSR2
168
+			#01 .brush/drag STZ
169 169
 			;&touch-end JMP2
170 170
 		&no-drag
171 171
 
172 172
 		( in sizepane )
173
-		.Mouse/x DEI2 CLN2r .sizepane/x1 PEK2 GTH2 STH2r .sizepane/x2 PEK2 LTH2 #0101 NEQ2 ,&no-touch-sizepane JCN
174
-		.Mouse/y DEI2 CLN2r .sizepane/y1 PEK2 GTH2 STH2r .sizepane/y2 PEK2 LTH2 #0101 NEQ2 ,&no-touch-sizepane JCN
173
+		.Mouse/x DEI2 CLN2r .sizepane/x1 LDZ2 GTH2 STH2r .sizepane/x2 LDZ2 LTH2 #0101 NEQ2 ,&no-touch-sizepane JCN
174
+		.Mouse/y DEI2 CLN2r .sizepane/y1 LDZ2 GTH2 STH2r .sizepane/y2 LDZ2 LTH2 #0101 NEQ2 ,&no-touch-sizepane JCN
175 175
 			( release ) #00 .Mouse/state DEO
176
-			#01 .brush/tool POK
177
-			.Mouse/x DEI2 .sizepane/x1 PEK2 SUB2 8/ SWP POP .brush/size POK
176
+			#01 .brush/tool STZ
177
+			.Mouse/x DEI2 .sizepane/x1 LDZ2 SUB2 8/ SWP POP .brush/size STZ
178 178
 			( draw ) ;draw-sizepane JSR2
179 179
 			( draw ) ;draw-toolpane JSR2
180 180
 			;&touch-end JMP2
181 181
 		&no-touch-sizepane
182 182
 
183 183
 		( in pattpane )
184
-		.Mouse/x DEI2 CLN2r .pattpane/x1 PEK2 GTH2 STH2r .pattpane/x2 PEK2 LTH2 #0101 NEQ2 ,&no-touch-pattpane JCN
185
-		.Mouse/y DEI2 CLN2r .pattpane/y1 PEK2 GTH2 STH2r .pattpane/y2 PEK2 LTH2 #0101 NEQ2 ,&no-touch-pattpane JCN
184
+		.Mouse/x DEI2 CLN2r .pattpane/x1 LDZ2 GTH2 STH2r .pattpane/x2 LDZ2 LTH2 #0101 NEQ2 ,&no-touch-pattpane JCN
185
+		.Mouse/y DEI2 CLN2r .pattpane/y1 LDZ2 GTH2 STH2r .pattpane/y2 LDZ2 LTH2 #0101 NEQ2 ,&no-touch-pattpane JCN
186 186
 			( release ) #00 .Mouse/state DEO
187
-			.Mouse/x DEI2 .pattpane/x1 PEK2 SUB2 8/ SWP POP .brush/patt POK
187
+			.Mouse/x DEI2 .pattpane/x1 LDZ2 SUB2 8/ SWP POP .brush/patt STZ
188 188
 			( draw ) ;draw-pattpane JSR2
189 189
 			;&touch-end JMP2
190 190
 		&no-touch-pattpane
191 191
 
192 192
 		( in toolpane )
193
-		.Mouse/x DEI2 CLN2r .toolpane/x1 PEK2 GTH2 STH2r .toolpane/x2 PEK2 LTH2 #0101 NEQ2 ,&no-touch-toolpane JCN
194
-		.Mouse/y DEI2 CLN2r .toolpane/y1 PEK2 GTH2 STH2r .toolpane/y2 PEK2 LTH2 #0101 NEQ2 ,&no-touch-toolpane JCN
193
+		.Mouse/x DEI2 CLN2r .toolpane/x1 LDZ2 GTH2 STH2r .toolpane/x2 LDZ2 LTH2 #0101 NEQ2 ,&no-touch-toolpane JCN
194
+		.Mouse/y DEI2 CLN2r .toolpane/y1 LDZ2 GTH2 STH2r .toolpane/y2 LDZ2 LTH2 #0101 NEQ2 ,&no-touch-toolpane JCN
195 195
 			( release ) #00 .Mouse/state DEO
196
-			.Mouse/x DEI2 .toolpane/x1 PEK2 SUB2 8/ SWP POP .brush/tool POK
196
+			.Mouse/x DEI2 .toolpane/x1 LDZ2 SUB2 8/ SWP POP .brush/tool STZ
197 197
 			( draw ) ;draw-toolpane JSR2
198 198
 			;&touch-end JMP2
199 199
 		&no-touch-toolpane
200 200
 
201 201
 		( in viewpane )
202
-		.Mouse/x DEI2 CLN2r .viewpane/x1 PEK2 GTH2 STH2r .viewpane/x2 PEK2 LTH2 #0101 NEQ2 ;&no-touch-viewpane JCN2
203
-		.Mouse/y DEI2 CLN2r .viewpane/y1 PEK2 GTH2 STH2r .viewpane/y2 PEK2 LTH2 #0101 NEQ2 ;&no-touch-viewpane JCN2
202
+		.Mouse/x DEI2 CLN2r .viewpane/x1 LDZ2 GTH2 STH2r .viewpane/x2 LDZ2 LTH2 #0101 NEQ2 ;&no-touch-viewpane JCN2
203
+		.Mouse/y DEI2 CLN2r .viewpane/y1 LDZ2 GTH2 STH2r .viewpane/y2 LDZ2 LTH2 #0101 NEQ2 ;&no-touch-viewpane JCN2
204 204
 			( release ) #00 .Mouse/state DEO
205
-			( clear ) .canvas/x1 PEK2 #0002 SUB2 .canvas/y1 PEK2 #0002 SUB2 .canvas/x2 PEK2 #0002 ADD2 .canvas/y2 PEK2 #0002 ADD2 #00 ;fill-rect JSR2
205
+			( clear ) .canvas/x1 LDZ2 #0002 SUB2 .canvas/y1 LDZ2 #0002 SUB2 .canvas/x2 LDZ2 #0002 ADD2 .canvas/y2 LDZ2 #0002 ADD2 #00 ;fill-rect JSR2
206 206
 			;draw-background JSR2
207
-			.Mouse/x DEI2 .viewpane/x1 PEK2 SUB2 8/ SWP POP
207
+			.Mouse/x DEI2 .viewpane/x1 LDZ2 SUB2 8/ SWP POP
208 208
 			DUP #00 NEQ ,&no-incwidth JCN
209
-				.canvas/w PEK2 ++ .canvas/w POK2
209
+				.canvas/w LDZ2 ++ .canvas/w STZ2
210 210
 			&no-incwidth
211 211
 			DUP #01 NEQ ,&no-decwidth JCN
212
-				.canvas/w PEK2 -- .canvas/w POK2
212
+				.canvas/w LDZ2 -- .canvas/w STZ2
213 213
 			&no-decwidth
214 214
 			DUP #02 NEQ ,&no-incheight JCN
215
-				.canvas/h PEK2 ++ .canvas/h POK2
215
+				.canvas/h LDZ2 ++ .canvas/h STZ2
216 216
 			&no-incheight
217 217
 			DUP #03 NEQ ,&no-decheight JCN
218
-				.canvas/h PEK2 -- .canvas/h POK2
218
+				.canvas/h LDZ2 -- .canvas/h STZ2
219 219
 			&no-decheight
220 220
 			POP
221 221
 			;fit-canvas JSR2
... ...
@@ -224,27 +224,27 @@ BRK
224 224
 		&no-touch-viewpane
225 225
 
226 226
 		( in canvas )
227
-		.Mouse/x DEI2 CLN2r .canvas/x1 PEK2 GTS2 STH2r .canvas/x2 PEK2 LTS2 #0101 NEQ2 ;&no-touch-canvas JCN2
228
-		.Mouse/y DEI2 CLN2r .canvas/y1 PEK2 GTS2 STH2r .canvas/y2 PEK2 LTS2 #0101 NEQ2 ;&no-touch-canvas JCN2
227
+		.Mouse/x DEI2 CLN2r .canvas/x1 LDZ2 GTS2 STH2r .canvas/x2 LDZ2 LTS2 #0101 NEQ2 ;&no-touch-canvas JCN2
228
+		.Mouse/y DEI2 CLN2r .canvas/y1 LDZ2 GTS2 STH2r .canvas/y2 LDZ2 LTS2 #0101 NEQ2 ;&no-touch-canvas JCN2
229 229
 
230 230
 			( set cursor operation )
231
-			;add-pixel .Mouse/state DEI #01 EQU ;&no-oper JCN2 POP2 ;remove-pixel &no-oper .brush/oper POK2
231
+			;add-pixel .Mouse/state DEI #01 EQU ;&no-oper JCN2 POP2 ;remove-pixel &no-oper .brush/oper STZ2
232 232
 
233
-			.brush/tool PEK #00 NEQ ,&no-touch-pen JCN
234
-				.cursor/x0 PEK2 .canvas/x1 PEK2 SUB2 .cursor/y0 PEK2 .canvas/y1 PEK2 SUB2 .Mouse/x DEI2 .canvas/x1 PEK2 SUB2 .Mouse/y DEI2 .canvas/y1 PEK2 SUB2 ;paint-line JSR2
233
+			.brush/tool LDZ #00 NEQ ,&no-touch-pen JCN
234
+				.cursor/x0 LDZ2 .canvas/x1 LDZ2 SUB2 .cursor/y0 LDZ2 .canvas/y1 LDZ2 SUB2 .Mouse/x DEI2 .canvas/x1 LDZ2 SUB2 .Mouse/y DEI2 .canvas/y1 LDZ2 SUB2 ;paint-line JSR2
235 235
 				;&touch-end JMP2
236 236
 			&no-touch-pen
237 237
 
238
-			.brush/tool PEK #01 NEQ ,&no-touch-brush JCN
239
-				.Mouse/x DEI2 .canvas/x1 PEK2 SUB2 .Mouse/y DEI2 .canvas/y1 PEK2 SUB2 ;paint-brush JSR2
238
+			.brush/tool LDZ #01 NEQ ,&no-touch-brush JCN
239
+				.Mouse/x DEI2 .canvas/x1 LDZ2 SUB2 .Mouse/y DEI2 .canvas/y1 LDZ2 SUB2 ;paint-brush JSR2
240 240
 				;&touch-end JMP2
241 241
 			&no-touch-brush
242 242
 
243
-			.brush/tool PEK #04 NEQ ,&no-touch-zoom JCN
244
-				.zoom/active PEK #00 EQU .zoom/active POK
243
+			.brush/tool LDZ #04 NEQ ,&no-touch-zoom JCN
244
+				.zoom/active LDZ #00 EQU .zoom/active STZ
245 245
 				( release ) #00 .Mouse/state DEO
246
-				.Mouse/x DEI2 .canvas/x1 PEK2 SUB2 .canvas/w PEK2 2/ SUB2 .zoom/x POK2
247
-				.Mouse/y DEI2 .canvas/y1 PEK2 SUB2 .canvas/h PEK2 2/ SUB2 .zoom/y POK2
246
+				.Mouse/x DEI2 .canvas/x1 LDZ2 SUB2 .canvas/w LDZ2 2/ SUB2 .zoom/x STZ2
247
+				.Mouse/y DEI2 .canvas/y1 LDZ2 SUB2 .canvas/h LDZ2 2/ SUB2 .zoom/y STZ2
248 248
 				;redraw JSR2
249 249
 				;&touch-end JMP2
250 250
 			&no-touch-zoom
... ...
@@ -260,7 +260,7 @@ BRK
260 260
 			&no-eye-button
261 261
 			DUP #01 NEQ ,&no-rename-button JCN
262 262
 				;rename JSR2
263
-				#01 .document/edit POK
263
+				#01 .document/edit STZ
264 264
 				( release ) #00 .Mouse/state DEO
265 265
 			&no-rename-button
266 266
 			DUP #02 NEQ ,&no-load-button JCN
... ...
@@ -280,71 +280,71 @@ BRK
280 280
 
281 281
 	&no-touch
282 282
 
283
-	.Mouse/x DEI2 .cursor/x0 POK2
284
-	.Mouse/y DEI2 .cursor/y0 POK2
285
-	.Mouse/state DEI .brush/last POK
283
+	.Mouse/x DEI2 .cursor/x0 STZ2
284
+	.Mouse/y DEI2 .cursor/y0 STZ2
285
+	.Mouse/state DEI .brush/last STZ
286 286
 
287 287
 BRK
288 288
 
289 289
 @on-button ( -> )
290 290
 
291 291
 	( if in renaming mode )
292
-	.document/edit PEK #01 NEQ ;&no-edit JCN2
292
+	.document/edit LDZ #01 NEQ ;&no-edit JCN2
293 293
 	.Controller/key DEI #00 EQU ;&no-edit JCN2
294 294
 		( enter )
295 295
 		.Controller/key DEI #0d NEQ ,&no-edit-enter JCN
296
-			#00 .document/edit POK
296
+			#00 .document/edit STZ
297 297
 			;redraw JSR2
298 298
 			BRK
299 299
 			&no-edit-enter
300 300
 		( backspace )
301 301
 		.Controller/key DEI #08 NEQ ,&no-edit-backspace JCN
302
-			.path/length PEK #00 EQU ,&edit-end JCN
303
-			.path/length PEK #01 SUB .path/length POK
304
-			#00 ;path/name #00 .path/length PEK ADD2 STA
302
+			.path/length LDZ #00 EQU ,&edit-end JCN
303
+			.path/length LDZ #01 SUB .path/length STZ
304
+			#00 ;path/name #00 .path/length LDZ ADD2 STA
305 305
 			BRK
306 306
 			&no-edit-backspace
307 307
 		( default )
308
-		.path/length PEK #1f EQU ,&edit-end JCN
309
-			.Controller/key DEI ;path/name #00 .path/length PEK ADD2 STA
310
-			.path/length PEK #01 ADD .path/length POK
308
+		.path/length LDZ #1f EQU ,&edit-end JCN
309
+			.Controller/key DEI ;path/name #00 .path/length LDZ ADD2 STA
310
+			.path/length LDZ #01 ADD .path/length STZ
311 311
 		&edit-end
312
-		#00 ;path/name #00 .path/length PEK ADD2 STA
312
+		#00 ;path/name #00 .path/length LDZ ADD2 STA
313 313
 		BRK
314 314
 	&no-edit
315 315
 	
316 316
 	( control zoom )
317
-	.zoom/active PEK #00 EQU ,&skip-zoom JCN
317
+	.zoom/active LDZ #00 EQU ,&skip-zoom JCN
318 318
 		.Controller/button DEI #f0 AND
319 319
 			DUP #04 SFT #01 AND #01 NEQ ,&no-up JCN
320
-				( move ) .zoom/y PEK2 -- .zoom/y POK2 &no-up
320
+				( move ) .zoom/y LDZ2 -- .zoom/y STZ2 &no-up
321 321
 			DUP #05 SFT #01 AND #01 NEQ ,&no-down JCN
322
-				( move ) .zoom/y PEK2 ++ .zoom/y POK2 &no-down
322
+				( move ) .zoom/y LDZ2 ++ .zoom/y STZ2 &no-down
323 323
 			DUP #06 SFT #01 AND #01 NEQ ,&no-left JCN
324
-				( move ) .zoom/x PEK2 -- .zoom/x POK2 &no-left
324
+				( move ) .zoom/x LDZ2 -- .zoom/x STZ2 &no-left
325 325
 			DUP #07 SFT #01 AND #01 NEQ ,&no-right JCN
326
-				( move ) .zoom/x PEK2 ++ .zoom/x POK2 &no-right
326
+				( move ) .zoom/x LDZ2 ++ .zoom/x STZ2 &no-right
327 327
 		#00 EQU #04 JCN ;draw-canvas JSR2
328 328
 	&skip-zoom
329 329
 
330 330
 	.Controller/key DEI
331 331
 	DUP #20 NEQ ,&no-space JCN
332
-		( toggle zoom ) .zoom/active PEK #00 EQU .zoom/active POK ;redraw JSR2 &no-space
332
+		( toggle zoom ) .zoom/active LDZ #00 EQU .zoom/active STZ ;redraw JSR2 &no-space
333 333
 	DUP #08 NEQ ,&no-backspace JCN
334 334
 		( erase ) ;clear JSR2 &no-backspace
335 335
 	DUP #71 NEQ ,&no-qkey JCN
336
-		( tool0 ) #00 .brush/tool POK ;draw-toolpane JSR2 &no-qkey
336
+		( tool0 ) #00 .brush/tool STZ ;draw-toolpane JSR2 &no-qkey
337 337
 	DUP #77 NEQ ,&no-wkey JCN
338
-		( tool0 ) #01 .brush/tool POK ;draw-toolpane JSR2 &no-wkey
338
+		( tool0 ) #01 .brush/tool STZ ;draw-toolpane JSR2 &no-wkey
339 339
 	DUP #65 NEQ ,&no-ekey JCN
340
-		( tool0 ) #02 .brush/tool POK ;draw-toolpane JSR2 &no-ekey
340
+		( tool0 ) #02 .brush/tool STZ ;draw-toolpane JSR2 &no-ekey
341 341
 	DUP #72 NEQ ,&no-rkey JCN
342
-		( tool0 ) #03 .brush/tool POK ;draw-toolpane JSR2 &no-rkey
342
+		( tool0 ) #03 .brush/tool STZ ;draw-toolpane JSR2 &no-rkey
343 343
 	DUP #74 NEQ ,&no-tkey JCN
344
-		( tool0 ) #04 .brush/tool POK ;draw-toolpane JSR2 &no-tkey
344
+		( tool0 ) #04 .brush/tool STZ ;draw-toolpane JSR2 &no-tkey
345 345
 	DUP
346 346
 		DUP #30 GTH SWP #39 LTH #0101 NEQ2 ,&no-numkey JCN
347
-		( size ) .Controller/key DEI #31 SUB .brush/size POK ;draw-sizepane JSR2 &no-numkey
347
+		( size ) .Controller/key DEI #31 SUB .brush/size STZ ;draw-sizepane JSR2 &no-numkey
348 348
 	POP
349 349
 
350 350
 BRK
... ...
@@ -352,12 +352,12 @@ BRK
352 352
 @center ( -- )
353 353
 	
354 354
 	( clear old )
355
-	.canvas/x1 PEK2 #0002 SUB2 .canvas/y1 PEK2 #0002 SUB2 .canvas/x2 PEK2 #0002 ADD2 .canvas/y2 PEK2 #0002 ADD2 #00 ;fill-rect JSR2
355
+	.canvas/x1 LDZ2 #0002 SUB2 .canvas/y1 LDZ2 #0002 SUB2 .canvas/x2 LDZ2 #0002 ADD2 .canvas/y2 LDZ2 #0002 ADD2 #00 ;fill-rect JSR2
356 356
 
357 357
 	;draw-background JSR2
358 358
 
359
-	.Screen/width DEI2 #0002 DIV2 .canvas/w PEK2 8* 2/ SUB2 .canvas/x1 POK2
360
-	.Screen/height DEI2 #0002 DIV2 .canvas/h PEK2 8* 2/ SUB2 .canvas/y1 POK2
359
+	.Screen/width DEI2 #0002 DIV2 .canvas/w LDZ2 8* 2/ SUB2 .canvas/x1 STZ2
360
+	.Screen/height DEI2 #0002 DIV2 .canvas/h LDZ2 8* 2/ SUB2 .canvas/y1 STZ2
361 361
 
362 362
 	;fit-canvas JSR2
363 363
 	;draw-foreground JSR2
... ...
@@ -367,7 +367,7 @@ RTN
367 367
 @rename
368 368
 	
369 369
 	;untitled_txt ;path/name ;strcpy JSR2
370
-	#00 .path/length POK
370
+	#00 .path/length STZ
371 371
 
372 372
 RTN
373 373
 
... ...
@@ -385,21 +385,21 @@ RTN
385 385
 
386 386
 @present
387 387
 
388
-	.document/presentation PEK #00 EQU .document/presentation POK
388
+	.document/presentation LDZ #00 EQU .document/presentation STZ
389 389
 
390
-	.document/presentation PEK
390
+	.document/presentation LDZ
391 391
 	DUP #00 NEQ ,&skip0 JCN
392
-		.theme/r0 PEK2 .System/r DEO2 .theme/g0 PEK2 .System/g DEO2 .theme/b0 PEK2 .System/b DEO2
392
+		.theme/r0 LDZ2 .System/r DEO2 .theme/g0 LDZ2 .System/g DEO2 .theme/b0 LDZ2 .System/b DEO2
393 393
 	&skip0
394 394
 	DUP #01 NEQ ,&skip1 JCN
395
-		.theme/r1 PEK2 .System/r DEO2 .theme/g1 PEK2 .System/g DEO2 .theme/b1 PEK2 .System/b DEO2
395
+		.theme/r1 LDZ2 .System/r DEO2 .theme/g1 LDZ2 .System/g DEO2 .theme/b1 LDZ2 .System/b DEO2
396 396
 	&skip1
397 397
 	POP
398 398
 
399
-	.toolpane/x1 PEK2 #0002 SUB2 .toolpane/y1 PEK2 #0002 SUB2 .toolpane/x2 PEK2 ++ .toolpane/y2 PEK2 ++ #00 ;fill-rect JSR2
400
-	.pattpane/x1 PEK2 #0002 SUB2 .pattpane/y1 PEK2 #0002 SUB2 .pattpane/x2 PEK2 ++ .pattpane/y2 PEK2 ++ #00 ;fill-rect JSR2
401
-	.sizepane/x1 PEK2 #0002 SUB2 .sizepane/y1 PEK2 #0002 SUB2 .sizepane/x2 PEK2 ++ .sizepane/y2 PEK2 ++ #00 ;fill-rect JSR2
402
-	.viewpane/x1 PEK2 #0002 SUB2 .viewpane/y1 PEK2 #0002 SUB2 .viewpane/x2 PEK2 ++ .viewpane/y2 PEK2 ++ #00 ;fill-rect JSR2
399
+	.toolpane/x1 LDZ2 #0002 SUB2 .toolpane/y1 LDZ2 #0002 SUB2 .toolpane/x2 LDZ2 ++ .toolpane/y2 LDZ2 ++ #00 ;fill-rect JSR2
400
+	.pattpane/x1 LDZ2 #0002 SUB2 .pattpane/y1 LDZ2 #0002 SUB2 .pattpane/x2 LDZ2 ++ .pattpane/y2 LDZ2 ++ #00 ;fill-rect JSR2
401
+	.sizepane/x1 LDZ2 #0002 SUB2 .sizepane/y1 LDZ2 #0002 SUB2 .sizepane/x2 LDZ2 ++ .sizepane/y2 LDZ2 ++ #00 ;fill-rect JSR2
402
+	.viewpane/x1 LDZ2 #0002 SUB2 .viewpane/y1 LDZ2 #0002 SUB2 .viewpane/x2 LDZ2 ++ .viewpane/y2 LDZ2 ++ #00 ;fill-rect JSR2
403 403
 
404 404
 	( clear panes )
405 405
 	;redraw JSR2
... ...
@@ -408,41 +408,41 @@ RTN
408 408
 
409 409
 @fit-canvas
410 410
 	
411
-	.canvas/w PEK2 8* .canvas/x1 PEK2 ADD2 .canvas/x2 POK2
412
-	.canvas/h PEK2 8* .canvas/y1 PEK2 ADD2 .canvas/y2 POK2
413
-	.canvas/x1 PEK2 -- .canvas/y1 PEK2 -- .canvas/x2 PEK2 .canvas/y2 PEK2 #01 ;line-rect JSR2
411
+	.canvas/w LDZ2 8* .canvas/x1 LDZ2 ADD2 .canvas/x2 STZ2
412
+	.canvas/h LDZ2 8* .canvas/y1 LDZ2 ADD2 .canvas/y2 STZ2
413
+	.canvas/x1 LDZ2 -- .canvas/y1 LDZ2 -- .canvas/x2 LDZ2 .canvas/y2 LDZ2 #01 ;line-rect JSR2
414 414
 	;draw-canvas JSR2
415 415
 
416 416
 RTN
417 417
 
418 418
 @paint-line ( x1 y1 x2 y2 -- )
419 419
 	
420
-	( load ) .line/y1 POK2 .line/x1 POK2 .line/y2 POK2 .line/x2 POK2
420
+	( load ) .line/y1 STZ2 .line/x1 STZ2 .line/y2 STZ2 .line/x2 STZ2
421 421
 
422 422
 	( trim if zoomed )
423
-	.zoom/active PEK #01 NEQ ,&no-zoom JCN
424
-		.line/x1 PEK2 8/ .zoom/x PEK2 ADD2 .line/x1 POK2
425
-		.line/y1 PEK2 8/ .zoom/y PEK2 ADD2 .line/y1 POK2
426
-		.line/x2 PEK2 8/ .zoom/x PEK2 ADD2 .line/x2 POK2
427
-		.line/y2 PEK2 8/ .zoom/y PEK2 ADD2 .line/y2 POK2
423
+	.zoom/active LDZ #01 NEQ ,&no-zoom JCN
424
+		.line/x1 LDZ2 8/ .zoom/x LDZ2 ADD2 .line/x1 STZ2
425
+		.line/y1 LDZ2 8/ .zoom/y LDZ2 ADD2 .line/y1 STZ2
426
+		.line/x2 LDZ2 8/ .zoom/x LDZ2 ADD2 .line/x2 STZ2
427
+		.line/y2 LDZ2 8/ .zoom/y LDZ2 ADD2 .line/y2 STZ2
428 428
 	&no-zoom
429 429
 
430
-	.line/x1 PEK2 .line/x2 PEK2 SUB2 ABS2 .line/dx POK2
431
-	.line/y1 PEK2 .line/y2 PEK2 SUB2 ABS2 #0000 SWP2 SUB2 .line/dy POK2
432
-	#ffff #00 .line/x2 PEK2 .line/x1 PEK2 LTS2 #0002 MUL2 ADD2 .line/sx POK2
433
-	#ffff #00 .line/y2 PEK2 .line/y1 PEK2 LTS2 #0002 MUL2 ADD2 .line/sy POK2
434
-	.line/dx PEK2 .line/dy PEK2 ADD2 .line/e1 POK2
430
+	.line/x1 LDZ2 .line/x2 LDZ2 SUB2 ABS2 .line/dx STZ2
431
+	.line/y1 LDZ2 .line/y2 LDZ2 SUB2 ABS2 #0000 SWP2 SUB2 .line/dy STZ2
432
+	#ffff #00 .line/x2 LDZ2 .line/x1 LDZ2 LTS2 #0002 MUL2 ADD2 .line/sx STZ2
433
+	#ffff #00 .line/y2 LDZ2 .line/y1 LDZ2 LTS2 #0002 MUL2 ADD2 .line/sy STZ2
434
+	.line/dx LDZ2 .line/dy LDZ2 ADD2 .line/e1 STZ2
435 435
 	&loop
436
-		( paint ) .line/x2 PEK2 .line/y2 PEK2 .brush/oper PEK2 JSR2
437
-		.line/x2 PEK2 .line/x1 PEK2 EQU2 .line/y2 PEK2 .line/y1 PEK2 EQU2 #0101 EQU2 ,&end JCN
438
-		.line/e1 PEK2 #0002 MUL2 .line/e2 POK2
439
-		.line/e2 PEK2 .line/dy PEK2 LTS2 ,&skipy JCN
440
-			.line/e1 PEK2 .line/dy PEK2 ADD2 .line/e1 POK2
441
-			.line/x2 PEK2 .line/sx PEK2 ADD2 .line/x2 POK2
436
+		( paint ) .line/x2 LDZ2 .line/y2 LDZ2 .brush/oper LDZ2 JSR2
437
+		.line/x2 LDZ2 .line/x1 LDZ2 EQU2 .line/y2 LDZ2 .line/y1 LDZ2 EQU2 #0101 EQU2 ,&end JCN
438
+		.line/e1 LDZ2 #0002 MUL2 .line/e2 STZ2
439
+		.line/e2 LDZ2 .line/dy LDZ2 LTS2 ,&skipy JCN
440
+			.line/e1 LDZ2 .line/dy LDZ2 ADD2 .line/e1 STZ2
441
+			.line/x2 LDZ2 .line/sx LDZ2 ADD2 .line/x2 STZ2
442 442
 		&skipy
443
-		.line/e2 PEK2 .line/dx PEK2 GTS2 ,&skipx JCN
444
-			.line/e1 PEK2 .line/dx PEK2 ADD2 .line/e1 POK2
445
-			.line/y2 PEK2 .line/sy PEK2 ADD2 .line/y2 POK2
443
+		.line/e2 LDZ2 .line/dx LDZ2 GTS2 ,&skipx JCN
444
+			.line/e1 LDZ2 .line/dx LDZ2 ADD2 .line/e1 STZ2
445
+			.line/y2 LDZ2 .line/sy LDZ2 ADD2 .line/y2 STZ2
446 446
 		&skipx
447 447
 		;&loop JMP2
448 448
 	&end
... ...
@@ -454,29 +454,29 @@ RTN
454 454
 
455 455
 @paint-rect ( x1 y1 x2 y2 -- )
456 456
 
457
-	( load ) .rect/y2 POK2 .rect/x2 POK2 .rect/y1 POK2 .rect/x1 POK2
457
+	( load ) .rect/y2 STZ2 .rect/x2 STZ2 .rect/y1 STZ2 .rect/x1 STZ2
458 458
 
459 459
 	( trim if zoomed )
460
-	.zoom/active PEK #01 NEQ ,&no-zoom JCN
461
-		.rect/x1 PEK2 8/ .zoom/x PEK2 ADD2 .rect/x1 POK2
462
-		.rect/y1 PEK2 8/ .zoom/y PEK2 ADD2 .rect/y1 POK2
463
-		.rect/x2 PEK2 8/ .zoom/x PEK2 ADD2 #0001 ADD2 .rect/x2 POK2
464
-		.rect/y2 PEK2 8/ .zoom/y PEK2 ADD2 #0001 ADD2 .rect/y2 POK2
460
+	.zoom/active LDZ #01 NEQ ,&no-zoom JCN
461
+		.rect/x1 LDZ2 8/ .zoom/x LDZ2 ADD2 .rect/x1 STZ2
462
+		.rect/y1 LDZ2 8/ .zoom/y LDZ2 ADD2 .rect/y1 STZ2
463
+		.rect/x2 LDZ2 8/ .zoom/x LDZ2 ADD2 #0001 ADD2 .rect/x2 STZ2
464
+		.rect/y2 LDZ2 8/ .zoom/y LDZ2 ADD2 #0001 ADD2 .rect/y2 STZ2
465 465
 	&no-zoom
466 466
 
467
-	.rect/x1 PEK2 .pt2/x POK2
468
-	.rect/y1 PEK2 .pt2/y POK2
467
+	.rect/x1 LDZ2 .pt2/x STZ2
468
+	.rect/y1 LDZ2 .pt2/y STZ2
469 469
 
470 470
 	&ver
471
-		.rect/x1 PEK2 .pt2/x POK2
471
+		.rect/x1 LDZ2 .pt2/x STZ2
472 472
 		&hor
473
-			.pt2/x PEK2 SWP POP .px/x POK .pt2/y PEK2 SWP POP .px/y POK
473
+			.pt2/x LDZ2 SWP POP .px/x STZ .pt2/y LDZ2 SWP POP .px/y STZ
474 474
 			;patternize JSR2 #00 EQU ,&no-pixel JCN
475
-				( draw ) .pt2/x PEK2 .pt2/y PEK2 .brush/oper PEK2 JSR2 &no-pixel
476
-			( incr ) .pt2/x PEK2 ++ .pt2/x POK2
477
-			.pt2/x PEK2 .rect/x2 PEK2 LTS2 ,&hor JCN
478
-		.pt2/y PEK2 ++ .pt2/y POK2
479
-		.pt2/y PEK2 .rect/y2 PEK2 LTS2 ,&ver JCN
475
+				( draw ) .pt2/x LDZ2 .pt2/y LDZ2 .brush/oper LDZ2 JSR2 &no-pixel
476
+			( incr ) .pt2/x LDZ2 ++ .pt2/x STZ2
477
+			.pt2/x LDZ2 .rect/x2 LDZ2 LTS2 ,&hor JCN
478
+		.pt2/y LDZ2 ++ .pt2/y STZ2
479
+		.pt2/y LDZ2 .rect/y2 LDZ2 LTS2 ,&ver JCN
480 480
 
481 481
 	;draw-canvas JSR2
482 482
 	;draw-foreground JSR2
... ...
@@ -485,27 +485,27 @@ RTN
485 485
 
486 486
 @paint-brush ( x y -- )
487 487
 
488
-	#0003 SUB2 .pt0/y POK2 #0003 SUB2 .pt0/x POK2 ( cursor offset )
488
+	#0003 SUB2 .pt0/y STZ2 #0003 SUB2 .pt0/x STZ2 ( cursor offset )
489 489
 
490 490
 	( trim if zoomed )
491
-	.zoom/active PEK #01 NEQ ,&no-zoom JCN
492
-		.pt0/x PEK2 8/ .zoom/x PEK2 ADD2 #0003 SUB2 .pt0/x POK2
493
-		.pt0/y PEK2 8/ .zoom/y PEK2 ADD2 #0003 SUB2 .pt0/y POK2
491
+	.zoom/active LDZ #01 NEQ ,&no-zoom JCN
492
+		.pt0/x LDZ2 8/ .zoom/x LDZ2 ADD2 #0003 SUB2 .pt0/x STZ2
493
+		.pt0/y LDZ2 8/ .zoom/y LDZ2 ADD2 #0003 SUB2 .pt0/y STZ2
494 494
 	&no-zoom
495 495
 
496
-	#00 .px/x POK #00 .px/y POK
496
+	#00 .px/x STZ #00 .px/y STZ
497 497
 	&ver
498
-		#00 .px/x POK
498
+		#00 .px/x STZ
499 499
 		&hor
500
-			( addr ) ;size_icns #00 .brush/size PEK 8* ADD2
501
-			( byte ) #00 .px/y PEK ADD2 LDA #07 .px/x PEK SUB SFT #01 AND
500
+			( addr ) ;size_icns #00 .brush/size LDZ 8* ADD2
501
+			( byte ) #00 .px/y LDZ ADD2 LDA #07 .px/x LDZ SUB SFT #01 AND
502 502
 			#00 EQU ,&no-pixel JCN
503 503
 			;patternize JSR2 #00 EQU ,&no-pixel JCN
504
-				.pt0/x PEK2 #00 .px/x PEK ADD2 .pt0/y PEK2 #00 .px/y PEK ADD2 .brush/oper PEK2 JSR2 &no-pixel
505
-			( incr ) .px/x PEK #01 ADD .px/x POK
506
-			.px/x PEK #08 LTH ,&hor JCN
507
-		( incr ) .px/y PEK #01 ADD .px/y POK
508
-		.px/y PEK #08 LTH ,&ver JCN
504
+				.pt0/x LDZ2 #00 .px/x LDZ ADD2 .pt0/y LDZ2 #00 .px/y LDZ ADD2 .brush/oper LDZ2 JSR2 &no-pixel
505
+			( incr ) .px/x LDZ #01 ADD .px/x STZ
506
+			.px/x LDZ #08 LTH ,&hor JCN
507
+		( incr ) .px/y LDZ #01 ADD .px/y STZ
508
+		.px/y LDZ #08 LTH ,&ver JCN
509 509
 
510 510
 	;draw-canvas JSR2
511 511
 	;draw-foreground JSR2
... ...
@@ -514,38 +514,38 @@ RTN
514 514
 
515 515
 @patternize ( -- )
516 516
 
517
-	.brush/patt PEK #00 NEQ ,&noplain JCN
517
+	.brush/patt LDZ #00 NEQ ,&noplain JCN
518 518
 		#01 RTN &noplain
519 519
 
520
-	.brush/patt PEK #01 NEQ ,&notone1 JCN
521
-		.pt0/x PEK2 #00 .px/x PEK ADD2 .pt0/y PEK2 #00 .px/y PEK ADD2 ADD2 #0001 AND2 #0000 EQU2
522
-		.pt0/x PEK2 #00 .px/x PEK ADD2 .pt0/y PEK2 #00 .px/y PEK ADD2 SUB2 #0001 AND2 #0000 EQU2
520
+	.brush/patt LDZ #01 NEQ ,&notone1 JCN
521
+		.pt0/x LDZ2 #00 .px/x LDZ ADD2 .pt0/y LDZ2 #00 .px/y LDZ ADD2 ADD2 #0001 AND2 #0000 EQU2
522
+		.pt0/x LDZ2 #00 .px/x LDZ ADD2 .pt0/y LDZ2 #00 .px/y LDZ ADD2 SUB2 #0001 AND2 #0000 EQU2
523 523
 		#0101 EQU2
524 524
 		RTN &notone1
525 525
 
526
-	.brush/patt PEK #02 NEQ ,&notone2 JCN
527
-		.pt0/x PEK2 #00 .px/x PEK ADD2 .pt0/y PEK2 #00 .px/y PEK ADD2 ADD2 #0003 AND2 #0000 EQU2
528
-		.pt0/x PEK2 #00 .px/x PEK ADD2 .pt0/y PEK2 #00 .px/y PEK ADD2 SUB2 #0003 AND2 #0000 EQU2
526
+	.brush/patt LDZ #02 NEQ ,&notone2 JCN
527
+		.pt0/x LDZ2 #00 .px/x LDZ ADD2 .pt0/y LDZ2 #00 .px/y LDZ ADD2 ADD2 #0003 AND2 #0000 EQU2
528
+		.pt0/x LDZ2 #00 .px/x LDZ ADD2 .pt0/y LDZ2 #00 .px/y LDZ ADD2 SUB2 #0003 AND2 #0000 EQU2
529 529
 		#0101 EQU2
530 530
 		RTN &notone2
531 531
 
532
-	.brush/patt PEK #03 NEQ ,&notone3 JCN
533
-		.pt0/x PEK2 #00 .px/x PEK ADD2 .pt0/y PEK2 #00 .px/y PEK ADD2 ADD2 #0005 AND2 #0000 EQU2
534
-		.pt0/x PEK2 #00 .px/x PEK ADD2 .pt0/y PEK2 #00 .px/y PEK ADD2 SUB2 #0005 AND2 #0000 EQU2
532
+	.brush/patt LDZ #03 NEQ ,&notone3 JCN
533
+		.pt0/x LDZ2 #00 .px/x LDZ ADD2 .pt0/y LDZ2 #00 .px/y LDZ ADD2 ADD2 #0005 AND2 #0000 EQU2
534
+		.pt0/x LDZ2 #00 .px/x LDZ ADD2 .pt0/y LDZ2 #00 .px/y LDZ ADD2 SUB2 #0005 AND2 #0000 EQU2
535 535
 		#0101 EQU2
536 536
 		RTN &notone3
537 537
 
538
-	.brush/patt PEK #04 NEQ ,&notone4 JCN
539
-		.pt0/x PEK2 #00 .px/x PEK ADD2 .pt0/y PEK2 #00 .px/y PEK ADD2 ADD2 #0003 AND2 #0000 EQU2 RTN &notone4
538
+	.brush/patt LDZ #04 NEQ ,&notone4 JCN
539
+		.pt0/x LDZ2 #00 .px/x LDZ ADD2 .pt0/y LDZ2 #00 .px/y LDZ ADD2 ADD2 #0003 AND2 #0000 EQU2 RTN &notone4
540 540
 
541
-	.brush/patt PEK #05 NEQ ,&notone5 JCN
542
-		.pt0/x PEK2 #00 .px/x PEK ADD2 .pt0/y PEK2 #00 .px/y PEK ADD2 SUB2 #0003 AND2 #0000 EQU2 RTN &notone5
541
+	.brush/patt LDZ #05 NEQ ,&notone5 JCN
542
+		.pt0/x LDZ2 #00 .px/x LDZ ADD2 .pt0/y LDZ2 #00 .px/y LDZ ADD2 SUB2 #0003 AND2 #0000 EQU2 RTN &notone5
543 543
 
544
-	.brush/patt PEK #06 NEQ ,&notone6 JCN
545
-		.pt0/x PEK2 #00 .px/x PEK ADD2 #0001 AND2 SWP POP RTN &notone6
544
+	.brush/patt LDZ #06 NEQ ,&notone6 JCN
545
+		.pt0/x LDZ2 #00 .px/x LDZ ADD2 #0001 AND2 SWP POP RTN &notone6
546 546
 
547
-	.brush/patt PEK #07 NEQ ,&notone7 JCN
548
-		.pt0/y PEK2 #00 .px/y PEK ADD2 #0001 AND2 SWP POP RTN &notone7
547
+	.brush/patt LDZ #07 NEQ ,&notone7 JCN
548
+		.pt0/y LDZ2 #00 .px/y LDZ ADD2 #0001 AND2 SWP POP RTN &notone7
549 549
 
550 550
 	#00
551 551
 
... ...
@@ -553,30 +553,30 @@ RTN
553 553
 
554 554
 @get-pixel ( x y -- b )
555 555
 
556
-	SWP POP #07 AND .px/y POK
557
-	SWP POP #07 AND .px/x POK
558
-	( get tile ) .pt1/x PEK2 8/ .pt1/y PEK2 8/ .canvas/w PEK2 MUL2 ADD2 8*
556
+	SWP POP #07 AND .px/y STZ
557
+	SWP POP #07 AND .px/x STZ
558
+	( get tile ) .pt1/x LDZ2 8/ .pt1/y LDZ2 8/ .canvas/w LDZ2 MUL2 ADD2 8*
559 559
 	( add addr ) ;data ADD2
560
-	#00 .px/y PEK ADD2 LDA #07 .px/x PEK SUB SFT #01 AND
560
+	#00 .px/y LDZ ADD2 LDA #07 .px/x LDZ SUB SFT #01 AND
561 561
 
562 562
 RTN
563 563
 
564 564
 @add-pixel ( x y -- )
565 565
 
566
-	.pt1/y POK2 .pt1/x POK2
567
-	( get tile addr ) ;data .pt1/x PEK2 8/ .pt1/y PEK2 8/ .canvas/w PEK2 MUL2 ADD2 8* .pt1/y PEK2 MOD8 ADD2 ADD2
566
+	.pt1/y STZ2 .pt1/x STZ2
567
+	( get tile addr ) ;data .pt1/x LDZ2 8/ .pt1/y LDZ2 8/ .canvas/w LDZ2 MUL2 ADD2 8* .pt1/y LDZ2 MOD8 ADD2 ADD2
568 568
 	( load ) DUP2 LDA
569
-	( mask ) #01 #07 .pt1/x PEK2 MOD8 SWP POP SUB SFL ORA
569
+	( mask ) #01 #07 .pt1/x LDZ2 MOD8 SWP POP SUB SFL ORA
570 570
 	( save ) ROT ROT STA
571 571
 
572 572
 RTN
573 573
 
574 574
 @remove-pixel ( x y -- )
575 575
 
576
-	.pt1/y POK2 .pt1/x POK2
577
-	( get tile addr ) ;data .pt1/x PEK2 8/ .pt1/y PEK2 8/ .canvas/w PEK2 MUL2 ADD2 8* .pt1/y PEK2 MOD8 ADD2 ADD2
576
+	.pt1/y STZ2 .pt1/x STZ2
577
+	( get tile addr ) ;data .pt1/x LDZ2 8/ .pt1/y LDZ2 8/ .canvas/w LDZ2 MUL2 ADD2 8* .pt1/y LDZ2 MOD8 ADD2 ADD2
578 578
 	( load ) DUP2 LDA
579
-	( mask ) #01 #07 .pt1/x PEK2 MOD8 SWP POP SUB SFL #ff EOR AND
579
+	( mask ) #01 #07 .pt1/x LDZ2 MOD8 SWP POP SUB SFL #ff EOR AND
580 580
 	( save ) ROT ROT STA
581 581
 
582 582
 RTN
... ...
@@ -609,39 +609,39 @@ RTN
609 609
 
610 610
 @draw-canvas ( -- )
611 611
 	
612
-	.zoom/active PEK #01 EQU ;draw-canvas-zoom JCN2
612
+	.zoom/active LDZ #01 EQU ;draw-canvas-zoom JCN2
613 613
 
614
-	.canvas/y1 PEK2 .Screen/y DEO2
614
+	.canvas/y1 LDZ2 .Screen/y DEO2
615 615
 	;data .Screen/addr DEO2
616 616
 	&ver
617
-		.canvas/x1 PEK2 .Screen/x DEO2
617
+		.canvas/x1 LDZ2 .Screen/x DEO2
618 618
 		&hor
619 619
 			( draw ) #29 .Screen/color DEO
620 620
 			( incr ) .Screen/x DEI2 8+ .Screen/x DEO2
621 621
 			( incr ) .Screen/addr DEI2 8+ .Screen/addr DEO2
622
-		.Screen/x DEI2 .canvas/x2 PEK2 NEQ2 ,&hor JCN
622
+		.Screen/x DEI2 .canvas/x2 LDZ2 NEQ2 ,&hor JCN
623 623
 		( incr ) .Screen/y DEI2 8+ .Screen/y DEO2
624
-	.Screen/y DEI2 .canvas/y2 PEK2 NEQ2 ,&ver JCN
624
+	.Screen/y DEI2 .canvas/y2 LDZ2 NEQ2 ,&ver JCN
625 625
 
626 626
 RTN
627 627
 
628 628
 @draw-canvas-zoom ( -- )
629 629
 	
630
-	.zoom/y PEK2 .pt1/y POK2
631
-	.canvas/y1 PEK2 .Screen/y DEO2
630
+	.zoom/y LDZ2 .pt1/y STZ2
631
+	.canvas/y1 LDZ2 .Screen/y DEO2
632 632
 	;data .Screen/addr DEO2
633 633
 	&ver
634
-		.canvas/x1 PEK2 .Screen/x DEO2
635
-		.zoom/x PEK2 .pt1/x POK2
634
+		.canvas/x1 LDZ2 .Screen/x DEO2
635
+		.zoom/x LDZ2 .pt1/x STZ2
636 636
 		&hor
637
-			( incr ) ;bigpixel_icn #0008 #00 .pt1/x PEK2 .pt1/y PEK2 ;get-pixel JSR2 MUL2 ADD2 .Screen/addr DEO2
637
+			( incr ) ;bigpixel_icn #0008 #00 .pt1/x LDZ2 .pt1/y LDZ2 ;get-pixel JSR2 MUL2 ADD2 .Screen/addr DEO2
638 638
 			( draw ) #29 .Screen/color DEO
639 639
 			( incr ) .Screen/x DEI2 8+ .Screen/x DEO2
640
-			( incr ) .pt1/x PEK2 ++ .pt1/x POK2
641
-		.Screen/x DEI2 .canvas/x2 PEK2 NEQ2 ,&hor JCN
640
+			( incr ) .pt1/x LDZ2 ++ .pt1/x STZ2
641
+		.Screen/x DEI2 .canvas/x2 LDZ2 NEQ2 ,&hor JCN
642 642
 		( incr ) .Screen/y DEI2 8+ .Screen/y DEO2
643
-		( incr ) .pt1/y PEK2 ++ .pt1/y POK2
644
-	.Screen/y DEI2 .canvas/y2 PEK2 NEQ2 ,&ver JCN
643
+		( incr ) .pt1/y LDZ2 ++ .pt1/y STZ2
644
+	.Screen/y DEI2 .canvas/y2 LDZ2 NEQ2 ,&ver JCN
645 645
 
646 646
 RTN
647 647
 
... ...
@@ -649,28 +649,28 @@ RTN
649 649
 
650 650
 	;blank_icn .Screen/addr DEO2
651 651
 	( clear brush size )
652
-	.cursor/x PEK2 #0003 SUB2 .Screen/x DEO2 .cursor/y PEK2 #0003 SUB2 .Screen/y DEO2 #30 .Screen/color DEO
652
+	.cursor/x LDZ2 #0003 SUB2 .Screen/x DEO2 .cursor/y LDZ2 #0003 SUB2 .Screen/y DEO2 #30 .Screen/color DEO
653 653
 	( clear last cursor )
654
-	.cursor/x PEK2 .Screen/x DEO2 .cursor/y PEK2 .Screen/y DEO2 #30 .Screen/color DEO
654
+	.cursor/x LDZ2 .Screen/x DEO2 .cursor/y LDZ2 .Screen/y DEO2 #30 .Screen/color DEO
655 655
 	( record cursor positions )
656
-	.Mouse/x DEI2 .cursor/x POK2 .Mouse/y DEI2 .cursor/y POK2
656
+	.Mouse/x DEI2 .cursor/x STZ2 .Mouse/y DEI2 .cursor/y STZ2
657 657
 	( draw size cursor )
658
-	.brush/tool PEK #01 NEQ ;&outside-canvas JCN2
658
+	.brush/tool LDZ #01 NEQ ;&outside-canvas JCN2
659 659
 	( do not draw size when holding alt )
660 660
 	.Controller/button DEI #02 EQU ;&outside-canvas JCN2
661
-	.Mouse/x DEI2 CLN2r .canvas/x1 PEK2 GTH2 STH2r .canvas/x2 PEK2 LTH2 #0101 NEQ2 ;&outside-canvas JCN2
662
-	.Mouse/y DEI2 CLN2r .canvas/y1 PEK2 GTH2 STH2r .canvas/y2 PEK2 LTH2 #0101 NEQ2 ;&outside-canvas JCN2	
661
+	.Mouse/x DEI2 CLN2r .canvas/x1 LDZ2 GTH2 STH2r .canvas/x2 LDZ2 LTH2 #0101 NEQ2 ;&outside-canvas JCN2
662
+	.Mouse/y DEI2 CLN2r .canvas/y1 LDZ2 GTH2 STH2r .canvas/y2 LDZ2 LTH2 #0101 NEQ2 ;&outside-canvas JCN2	
663 663
 	( do not draw size in toolpane )
664
-	.Mouse/x DEI2 CLN2r .toolpane/x1 PEK2 GTH2 STH2r .toolpane/x2 PEK2 LTH2 #0101 EQU2 .Mouse/y DEI2 CLN2r .toolpane/y1 PEK2 GTH2 STH2r .toolpane/y2 PEK2 LTH2 #0101 EQU2 #0101 EQU2 ;&outside-canvas JCN2
665
-	.Mouse/x DEI2 CLN2r .sizepane/x1 PEK2 GTH2 STH2r .sizepane/x2 PEK2 LTH2 #0101 EQU2 .Mouse/y DEI2 CLN2r .sizepane/y1 PEK2 GTH2 STH2r .sizepane/y2 PEK2 LTH2 #0101 EQU2 #0101 EQU2 ;&outside-canvas JCN2
666
-	.Mouse/x DEI2 CLN2r .pattpane/x1 PEK2 GTH2 STH2r .pattpane/x2 PEK2 LTH2 #0101 EQU2 .Mouse/y DEI2 CLN2r .pattpane/y1 PEK2 GTH2 STH2r .pattpane/y2 PEK2 LTH2 #0101 EQU2 #0101 EQU2 ;&outside-canvas JCN2
667
-		.cursor/x PEK2 #0003 SUB2 .Screen/x DEO2 .cursor/y PEK2 #0003 SUB2 .Screen/y DEO2
668
-		;brush_icns #00 .brush/size PEK 8* ADD2 .Screen/addr DEO2
664
+	.Mouse/x DEI2 CLN2r .toolpane/x1 LDZ2 GTH2 STH2r .toolpane/x2 LDZ2 LTH2 #0101 EQU2 .Mouse/y DEI2 CLN2r .toolpane/y1 LDZ2 GTH2 STH2r .toolpane/y2 LDZ2 LTH2 #0101 EQU2 #0101 EQU2 ;&outside-canvas JCN2
665
+	.Mouse/x DEI2 CLN2r .sizepane/x1 LDZ2 GTH2 STH2r .sizepane/x2 LDZ2 LTH2 #0101 EQU2 .Mouse/y DEI2 CLN2r .sizepane/y1 LDZ2 GTH2 STH2r .sizepane/y2 LDZ2 LTH2 #0101 EQU2 #0101 EQU2 ;&outside-canvas JCN2
666
+	.Mouse/x DEI2 CLN2r .pattpane/x1 LDZ2 GTH2 STH2r .pattpane/x2 LDZ2 LTH2 #0101 EQU2 .Mouse/y DEI2 CLN2r .pattpane/y1 LDZ2 GTH2 STH2r .pattpane/y2 LDZ2 LTH2 #0101 EQU2 #0101 EQU2 ;&outside-canvas JCN2
667
+		.cursor/x LDZ2 #0003 SUB2 .Screen/x DEO2 .cursor/y LDZ2 #0003 SUB2 .Screen/y DEO2
668
+		;brush_icns #00 .brush/size LDZ 8* ADD2 .Screen/addr DEO2
669 669
 		#31 .Mouse/state DEI #02 MUL ADD .Screen/color DEO
670 670
 		.Mouse/state DEI #00 EQU ,&outside-canvas JCN RTN
671 671
 	&outside-canvas
672 672
 	( draw new cursor )
673
-	.cursor/x PEK2 .Screen/x DEO2 .cursor/y PEK2 .Screen/y DEO2
673
+	.cursor/x LDZ2 .Screen/x DEO2 .cursor/y LDZ2 .Screen/y DEO2
674 674
 	;pointers_icn #00 .Controller/button DEI #02 EQU 8* ADD2 .Screen/addr DEO2
675 675
 	#3f .Mouse/state DEI #01 EQU #0a MUL SUB .Screen/color DEO
676 676
 
... ...
@@ -678,79 +678,79 @@ RTN
678 678
 
679 679
 @draw-toolpane ( -- )
680 680
 
681
-	.document/presentation PEK #00 EQU ,&skip JCN RTN &skip
681
+	.document/presentation LDZ #00 EQU ,&skip JCN RTN &skip
682 682
 
683 683
 	( frame ) 	
684
-	.toolpane/x1 PEK2 -- .toolpane/y1 PEK2 -- .toolpane/x2 PEK2 .toolpane/y2 PEK2 #00 ;line-rect JSR2
685
-	.toolpane/x1 PEK2 #0002 SUB2 .toolpane/y1 PEK2 #0002 SUB2 .toolpane/x2 PEK2 .toolpane/y2 PEK2 #01 ;line-rect JSR2
684
+	.toolpane/x1 LDZ2 -- .toolpane/y1 LDZ2 -- .toolpane/x2 LDZ2 .toolpane/y2 LDZ2 #00 ;line-rect JSR2
685
+	.toolpane/x1 LDZ2 #0002 SUB2 .toolpane/y1 LDZ2 #0002 SUB2 .toolpane/x2 LDZ2 .toolpane/y2 LDZ2 #01 ;line-rect JSR2
686 686
 
687
-	.toolpane/x1 PEK2 .Screen/x DEO2 .toolpane/y1 PEK2 .Screen/y DEO2 ;tool_icns .Screen/addr DEO2
687
+	.toolpane/x1 LDZ2 .Screen/x DEO2 .toolpane/y1 LDZ2 .Screen/y DEO2 ;tool_icns .Screen/addr DEO2
688 688
 
689 689
 	&loop
690
-		( draw ) #21 .Screen/x DEI2 .toolpane/x1 PEK2 SUB2 8/ SWP POP .brush/tool PEK EQU #02 MUL ADD .Screen/color DEO
690
+		( draw ) #21 .Screen/x DEI2 .toolpane/x1 LDZ2 SUB2 8/ SWP POP .brush/tool LDZ EQU #02 MUL ADD .Screen/color DEO
691 691
 		( incr ) .Screen/x DEI2 8+ .Screen/x DEO2
692 692
 		( incr ) .Screen/addr DEI2 8+ .Screen/addr DEO2
693
-		.Screen/x DEI2 .toolpane/x2 PEK2 LTH2 ,&loop JCN
693
+		.Screen/x DEI2 .toolpane/x2 LDZ2 LTH2 ,&loop JCN
694 694
 
695
-	.zoom/active PEK #01 NEQ ,&no-zoom JCN
695
+	.zoom/active LDZ #01 NEQ ,&no-zoom JCN
696 696
 		.Screen/x DEI2 #0008 SUB2 .Screen/x DEO2
697 697
 		;tool_icns #0028 ADD2 .Screen/addr DEO2
698
-		#21 #04 .brush/tool PEK EQU #02 MUL ADD .Screen/color DEO
698
+		#21 #04 .brush/tool LDZ EQU #02 MUL ADD .Screen/color DEO
699 699
 		&no-zoom
700 700
 
701 701
 RTN
702 702
 
703 703
 @draw-pattpane ( -- )
704 704
 
705
-	.document/presentation PEK #00 EQU ,&skip JCN RTN &skip
705
+	.document/presentation LDZ #00 EQU ,&skip JCN RTN &skip
706 706
 
707 707
 	( frame ) 	
708
-	.pattpane/x1 PEK2 -- .pattpane/y1 PEK2 -- .pattpane/x2 PEK2 .pattpane/y2 PEK2 #00 ;line-rect JSR2
709
-	.pattpane/x1 PEK2 #0002 SUB2 .pattpane/y1 PEK2 #0002 SUB2 .pattpane/x2 PEK2 .pattpane/y2 PEK2 #01 ;line-rect JSR2
708
+	.pattpane/x1 LDZ2 -- .pattpane/y1 LDZ2 -- .pattpane/x2 LDZ2 .pattpane/y2 LDZ2 #00 ;line-rect JSR2
709
+	.pattpane/x1 LDZ2 #0002 SUB2 .pattpane/y1 LDZ2 #0002 SUB2 .pattpane/x2 LDZ2 .pattpane/y2 LDZ2 #01 ;line-rect JSR2
710 710
 
711
-	.pattpane/x1 PEK2 .Screen/x DEO2 .pattpane/y1 PEK2 .Screen/y DEO2 ;patt_icns .Screen/addr DEO2
711
+	.pattpane/x1 LDZ2 .Screen/x DEO2 .pattpane/y1 LDZ2 .Screen/y DEO2 ;patt_icns .Screen/addr DEO2
712 712
 
713 713
 	&loop
714
-		( draw ) #21 .Screen/x DEI2 .pattpane/x1 PEK2 SUB2 8/ SWP POP .brush/patt PEK EQU #02 MUL ADD .Screen/color DEO
714
+		( draw ) #21 .Screen/x DEI2 .pattpane/x1 LDZ2 SUB2 8/ SWP POP .brush/patt LDZ EQU #02 MUL ADD .Screen/color DEO
715 715
 		( incr ) .Screen/x DEI2 8+ .Screen/x DEO2
716 716
 		( incr ) .Screen/addr DEI2 8+ .Screen/addr DEO2
717
-		.Screen/x DEI2 .pattpane/x2 PEK2 LTH2 ,&loop JCN
717
+		.Screen/x DEI2 .pattpane/x2 LDZ2 LTH2 ,&loop JCN
718 718
 
719 719
 RTN
720 720
 
721 721
 @draw-sizepane ( -- )
722 722
 
723
-	.document/presentation PEK #00 EQU ,&skip JCN RTN &skip
723
+	.document/presentation LDZ #00 EQU ,&skip JCN RTN &skip
724 724
 
725 725
 	( frame )
726
-	.sizepane/x1 PEK2 -- .sizepane/y1 PEK2 -- .sizepane/x2 PEK2 .sizepane/y2 PEK2 #00 ;line-rect JSR2
727
-	.sizepane/x1 PEK2 #0002 SUB2 .sizepane/y1 PEK2 #0002 SUB2 .sizepane/x2 PEK2 .sizepane/y2 PEK2 #01 ;line-rect JSR2
726
+	.sizepane/x1 LDZ2 -- .sizepane/y1 LDZ2 -- .sizepane/x2 LDZ2 .sizepane/y2 LDZ2 #00 ;line-rect JSR2
727
+	.sizepane/x1 LDZ2 #0002 SUB2 .sizepane/y1 LDZ2 #0002 SUB2 .sizepane/x2 LDZ2 .sizepane/y2 LDZ2 #01 ;line-rect JSR2
728 728
 
729
-	.sizepane/x1 PEK2 .Screen/x DEO2 .sizepane/y1 PEK2 .Screen/y DEO2 ;size_icns .Screen/addr DEO2
729
+	.sizepane/x1 LDZ2 .Screen/x DEO2 .sizepane/y1 LDZ2 .Screen/y DEO2 ;size_icns .Screen/addr DEO2
730 730
 
731 731
 	&loop
732
-		( draw ) #21 .Screen/x DEI2 .sizepane/x1 PEK2 SUB2 8/ SWP POP .brush/size PEK EQU #02 MUL ADD .Screen/color DEO
732
+		( draw ) #21 .Screen/x DEI2 .sizepane/x1 LDZ2 SUB2 8/ SWP POP .brush/size LDZ EQU #02 MUL ADD .Screen/color DEO
733 733
 		( incr ) .Screen/x DEI2 8+ .Screen/x DEO2
734 734
 		( incr ) .Screen/addr DEI2 8+ .Screen/addr DEO2
735
-		.Screen/x DEI2 .sizepane/x2 PEK2 LTH2 ,&loop JCN
735
+		.Screen/x DEI2 .sizepane/x2 LDZ2 LTH2 ,&loop JCN
736 736
 
737 737
 RTN
738 738
 
739 739
 @draw-viewpane ( -- )
740 740
 	
741
-	.document/presentation PEK #00 EQU ,&skip JCN RTN &skip
741
+	.document/presentation LDZ #00 EQU ,&skip JCN RTN &skip
742 742
 
743 743
 	( frame )
744
-	.viewpane/x1 PEK2 -- .viewpane/y1 PEK2 -- .viewpane/x2 PEK2 .viewpane/y2 PEK2 #00 ;line-rect JSR2
745
-	.viewpane/x1 PEK2 #0002 SUB2 .viewpane/y1 PEK2 #0002 SUB2 .viewpane/x2 PEK2 .viewpane/y2 PEK2 #01 ;line-rect JSR2
744
+	.viewpane/x1 LDZ2 -- .viewpane/y1 LDZ2 -- .viewpane/x2 LDZ2 .viewpane/y2 LDZ2 #00 ;line-rect JSR2
745
+	.viewpane/x1 LDZ2 #0002 SUB2 .viewpane/y1 LDZ2 #0002 SUB2 .viewpane/x2 LDZ2 .viewpane/y2 LDZ2 #01 ;line-rect JSR2
746 746
 
747
-	.viewpane/x1 PEK2 .Screen/x DEO2 .viewpane/y1 PEK2 .Screen/y DEO2 ;view_icns .Screen/addr DEO2
747
+	.viewpane/x1 LDZ2 .Screen/x DEO2 .viewpane/y1 LDZ2 .Screen/y DEO2 ;view_icns .Screen/addr DEO2
748 748
 
749 749
 	&loop
750 750
 		( draw ) #21 .Screen/color DEO
751 751
 		( incr ) .Screen/x DEI2 8+ .Screen/x DEO2
752 752
 		( incr ) .Screen/addr DEI2 8+ .Screen/addr DEO2
753
-		.Screen/x DEI2 .viewpane/x2 PEK2 LTH2 ,&loop JCN
753
+		.Screen/x DEI2 .viewpane/x2 LDZ2 LTH2 ,&loop JCN
754 754
 
755 755
 RTN
756 756
 
... ...
@@ -766,29 +766,29 @@ RTN
766 766
 @draw-background
767 767
 	
768 768
 	( draw hor line )
769
-	#0000 .Screen/width DEI2 .Screen/height DEI2 #0002 DIV2 .document/presentation PEK #00 EQU ;line-horizontal-dotted JSR2
769
+	#0000 .Screen/width DEI2 .Screen/height DEI2 #0002 DIV2 .document/presentation LDZ #00 EQU ;line-horizontal-dotted JSR2
770 770
 	( draw ver line )
771
-	.Screen/width DEI2 #0002 DIV2 #0000 .Screen/height DEI2 .document/presentation PEK #00 EQU ;line-vertical-dotted JSR2
771
+	.Screen/width DEI2 #0002 DIV2 #0000 .Screen/height DEI2 .document/presentation LDZ #00 EQU ;line-vertical-dotted JSR2
772 772
 
773
-	.document/presentation PEK #01 EQU ;&skip-size JCN2
773
+	.document/presentation LDZ #01 EQU ;&skip-size JCN2
774 774
 		( draw size )
775 775
 		#0010 .Screen/y DEO2
776 776
 		( draw width )
777
-		.Screen/width DEI2 #00a0 SUB2 .Screen/x DEO2 ;font_hex .canvas/w PEK2 #f0 AND #04 SFT #08 MUL ADD2 .Screen/addr DEO2
777
+		.Screen/width DEI2 #00a0 SUB2 .Screen/x DEO2 ;font_hex .canvas/w LDZ2 #f0 AND #04 SFT #08 MUL ADD2 .Screen/addr DEO2
778 778
 		( draw ) #21 .Screen/color DEO
779
-		.Screen/x DEI2 8+ .Screen/x DEO2 ;font_hex .canvas/w PEK2 #0f AND #08 MUL ADD2 .Screen/addr DEO2
779
+		.Screen/x DEI2 8+ .Screen/x DEO2 ;font_hex .canvas/w LDZ2 #0f AND #08 MUL ADD2 .Screen/addr DEO2
780 780
 		( draw ) #21 .Screen/color DEO
781 781
 		( draw height )
782
-		.Screen/x DEI2 8+ .Screen/x DEO2 ;font_hex .canvas/h PEK2 #f0 AND #04 SFT #08 MUL ADD2 .Screen/addr DEO2
782
+		.Screen/x DEI2 8+ .Screen/x DEO2 ;font_hex .canvas/h LDZ2 #f0 AND #04 SFT #08 MUL ADD2 .Screen/addr DEO2
783 783
 		( draw ) #21 .Screen/color DEO
784
-		.Screen/x DEI2 8+ .Screen/x DEO2 ;font_hex .canvas/h PEK2 #0f AND #08 MUL ADD2 .Screen/addr DEO2
784
+		.Screen/x DEI2 8+ .Screen/x DEO2 ;font_hex .canvas/h LDZ2 #0f AND #08 MUL ADD2 .Screen/addr DEO2
785 785
 		( draw ) #21 .Screen/color DEO
786 786
 	&skip-size
787 787
 
788 788
 	( draw save/load/guides icons )
789 789
 	.Screen/height DEI2 #0010 SUB2 .Screen/y DEO2
790 790
 	.Screen/width DEI2 #0028 SUB2 .Screen/x DEO2
791
-	;eye_icn #00 .document/presentation PEK #08 MUL ADD2 .Screen/addr DEO2
791
+	;eye_icn #00 .document/presentation LDZ #08 MUL ADD2 .Screen/addr DEO2
792 792
 	#23 .Screen/color DEO
793 793
 	.Screen/x DEI2 8+ .Screen/x DEO2
794 794
 	;filestate_icn .Screen/addr DEO2
... ...
@@ -809,20 +809,20 @@ RTN
809 809
 
810 810
 @line-rect ( x1 y1 x2 y2 color -- )
811 811
 
812
-	( load ) .color POK DUP2 STH2 .rect/y2 POK2 .rect/x2 POK2 DUP2 STH2 .rect/y1 POK2 .rect/x1 POK2
812
+	( load ) .color STZ DUP2 STH2 .rect/y2 STZ2 .rect/x2 STZ2 DUP2 STH2 .rect/y1 STZ2 .rect/x1 STZ2
813 813
 	STH2r STH2r
814 814
 	&ver
815 815
 		( save ) OVR2 .Screen/y DEO2
816
-		( draw ) .rect/x1 PEK2 .Screen/x DEO2 .color PEK DUP .Screen/color DEO
817
-		( draw ) .rect/x2 PEK2 .Screen/x DEO2 .Screen/color DEO
816
+		( draw ) .rect/x1 LDZ2 .Screen/x DEO2 .color LDZ DUP .Screen/color DEO
817
+		( draw ) .rect/x2 LDZ2 .Screen/x DEO2 .Screen/color DEO
818 818
 		( incr ) SWP2 ++ SWP2
819 819
 		OVR2 OVR2 LTS2 ,&ver JCN
820 820
 	POP2 POP2
821
-	.rect/x1 PEK2 .rect/x2 PEK2
821
+	.rect/x1 LDZ2 .rect/x2 LDZ2
822 822
 	&hor
823 823
 		( save ) OVR2 .Screen/x DEO2
824
-		( draw ) .rect/y1 PEK2 .Screen/y DEO2 .color PEK DUP .Screen/color DEO
825
-		( draw ) .rect/y2 PEK2 .Screen/y DEO2 .Screen/color DEO
824
+		( draw ) .rect/y1 LDZ2 .Screen/y DEO2 .color LDZ DUP .Screen/color DEO
825
+		( draw ) .rect/y2 LDZ2 .Screen/y DEO2 .Screen/color DEO
826 826
 		( incr ) SWP2 ++ SWP2
827 827
 		OVR2 OVR2 ++ LTS2 ,&hor JCN
828 828
 	POP2 POP2
... ...
@@ -831,14 +831,14 @@ RTN
831 831
 
832 832
 @fill-rect ( x1 y1 x2 y2 color -- )
833 833
 	
834
-	.color POK
834
+	.color STZ
835 835
 	( x1 x2 y1 y2 ) ROT2 SWP2
836 836
 	&ver
837 837
 		( save ) OVR2 .Screen/y DEO2
838 838
 		STH2 STH2 OVR2 OVR2
839 839
 		&hor
840 840
 			( save ) OVR2 .Screen/x DEO2
841
-			( draw ) .color PEK .Screen/color DEO
841
+			( draw ) .color LDZ .Screen/color DEO
842 842
 			( incr ) SWP2 ++ SWP2
843 843
 			OVR2 OVR2 LTS2 ,&hor JCN
844 844
 		POP2 POP2 STH2r STH2r
... ...
@@ -850,10 +850,10 @@ RTN
850 850
 
851 851
 @draw-label ( addr color -- )
852 852
 	
853
-	.color POK
853
+	.color STZ
854 854
 	&loop
855 855
 		DUP2 LDA #00 SWP #0008 MUL2 ;font ADD2 .Screen/addr DEO2
856
-		( draw ) .color PEK #20 ADD .Screen/color DEO
856
+		( draw ) .color LDZ #20 ADD .Screen/color DEO
857 857
 		( incr ) #0001 ADD2
858 858
 		( incr ) .Screen/x DEI2 8+ .Screen/x DEO2
859 859
 		( loop ) DUP2 LDA #00 NEQ ,&loop JCN
... ...
@@ -863,9 +863,9 @@ RTN
863 863
 
864 864
 @line-horizontal-dotted ( x0 x1 y color -- )
865 865
 	
866
-	.color POK .Screen/y DEO2 OVR2 .Screen/x DEO2
866
+	.color STZ .Screen/y DEO2 OVR2 .Screen/x DEO2
867 867
 	&draw-hor
868
-		( draw ) .color PEK .Screen/color DEO
868
+		( draw ) .color LDZ .Screen/color DEO
869 869
 		( incr ) SWP2 #0002 ADD2 DUP2 .Screen/x DEO2 SWP2
870 870
 		OVR2 OVR2 LTH2 ,&draw-hor JCN
871 871
 	POP2 POP2
... ...
@@ -874,9 +874,9 @@ RTN
874 874
 
875 875
 @line-vertical-dotted ( x y0 y1 color -- )
876 876
 	
877
-	.color POK STH2 SWP2 .Screen/x DEO2 STH2r OVR2 .Screen/y DEO2
877
+	.color STZ STH2 SWP2 .Screen/x DEO2 STH2r OVR2 .Screen/y DEO2
878 878
 	&draw-ver
879
-		( draw ) .color PEK .Screen/color DEO
879
+		( draw ) .color LDZ .Screen/color DEO
880 880
 		( incr ) SWP2 #0002 ADD2 DUP2 .Screen/y DEO2 SWP2
881 881
 		OVR2 OVR2 LTH2 ,&draw-ver JCN
882 882
 	POP2 POP2
... ...
@@ -24,7 +24,7 @@
24 24
 %LDA-CHAR { #24 MOD #00 SWP ;b36clc ADD2 LDA } ( b36 -- char )
25 25
 %LDA-VALUE { #20 SUB #00 SWP ;values ADD2 LDA } ( char -- b36 )
26 26
 
27
-%LDA-INDEX { #00 SWP #00 .grid/width PEK MUL2 ROT #00 SWP ADD2 } ( x y -- index )
27
+%LDA-INDEX { #00 SWP #00 .grid/width LDZ MUL2 ROT #00 SWP ADD2 } ( x y -- index )
28 28
 %LDA-CELL { LDA-INDEX DATA-CELLS ADD2 LDA } ( x y -- char )
29 29
 %SET-CELL { ROT ROT LDA-INDEX DATA-CELLS ADD2 STA } ( x y char -- )
30 30
 %LDA-TYPE { LDA-INDEX DATA-TYPES ADD2 LDA } ( x y -- type )
... ...
@@ -59,8 +59,8 @@
59 59
 	( vectors ) ;on-frame .Screen/vector DEO2
60 60
 
61 61
 	( find size )
62
-	.Screen/width DEI2 8/ SWP POP .grid/width POK
63
-	.Screen/height DEI2 8/ SWP POP #02 SUB .grid/height POK
62
+	.Screen/width DEI2 8/ SWP POP .grid/width STZ
63
+	.Screen/height DEI2 8/ SWP POP #02 SUB .grid/height STZ
64 64
 
65 65
 	( fill grid with dots )
66 66
 
... ...
@@ -71,47 +71,47 @@ BRK
71 71
 
72 72
 @on-frame
73 73
 
74
-	.timer PEK ++ DUP .timer POK
74
+	.timer LDZ ++ DUP .timer STZ
75 75
 
76 76
 	( skip ) #08 EQU ,&tick JCN BRK &tick
77 77
 
78
-	.timer/frame PEK ++ .timer/frame POK
78
+	.timer/frame LDZ ++ .timer/frame STZ
79 79
 
80 80
 	;run JSR2
81 81
 
82
-	#00 .timer POK
82
+	#00 .timer STZ
83 83
 
84 84
 BRK
85 85
 
86 86
 @on-button
87 87
 	
88 88
 	.Controller/key DEI #00 EQU ,&no-key JCN
89
-		.selection/x1 PEK .selection/y1 PEK .Controller/key DEI SET-CELL
89
+		.selection/x1 LDZ .selection/y1 LDZ .Controller/key DEI SET-CELL
90 90
 		;redraw JSR2
91 91
 	&no-key
92 92
 
93 93
 	( arrows )
94 94
 	.Controller/button DEI #f0 AND
95 95
 		DUP #04 SFT #01 AND #01 NEQ ,&no-up JCN
96
-			.selection/y1 PEK #00 EQU ,&no-up JCN
97
-			.selection/y1 PEK -- .selection/y1 POK
98
-			.selection/y2 PEK -- .selection/y2 POK &no-up
96
+			.selection/y1 LDZ #00 EQU ,&no-up JCN
97
+			.selection/y1 LDZ -- .selection/y1 STZ
98
+			.selection/y2 LDZ -- .selection/y2 STZ &no-up
99 99
 		DUP #05 SFT #01 AND #01 NEQ ,&no-down JCN
100
-			.selection/y1 PEK .grid/height PEK -- EQU ,&no-down JCN
101
-			.selection/y1 PEK ++ .selection/y1 POK
102
-			.selection/y2 PEK ++ .selection/y2 POK &no-down
100
+			.selection/y1 LDZ .grid/height LDZ -- EQU ,&no-down JCN
101
+			.selection/y1 LDZ ++ .selection/y1 STZ
102
+			.selection/y2 LDZ ++ .selection/y2 STZ &no-down
103 103
 		DUP #06 SFT #01 AND #01 NEQ ,&no-left JCN
104
-			.selection/x1 PEK #00 EQU ,&no-left JCN
105
-			.selection/x1 PEK -- .selection/x1 POK
106
-			.selection/x2 PEK -- .selection/x2 POK &no-left
104
+			.selection/x1 LDZ #00 EQU ,&no-left JCN
105
+			.selection/x1 LDZ -- .selection/x1 STZ
106
+			.selection/x2 LDZ -- .selection/x2 STZ &no-left
107 107
 		DUP #07 SFT #01 AND #01 NEQ ,&no-right JCN
108
-			.selection/x1 PEK .grid/width PEK -- EQU ,&no-right JCN
109
-			.selection/x1 PEK ++ .selection/x1 POK
110
-			.selection/x2 PEK ++ .selection/x2 POK &no-right
108
+			.selection/x1 LDZ .grid/width LDZ -- EQU ,&no-right JCN
109
+			.selection/x1 LDZ ++ .selection/x1 STZ
110
+			.selection/x2 LDZ ++ .selection/x2 STZ &no-right
111 111
 	POP
112 112
 
113 113
 	.Controller/key DEI #08 NEQ ,&no-backspace JCN
114
-		.selection/x1 PEK .selection/y1 PEK #2e SET-CELL ( put . char )
114
+		.selection/x1 LDZ .selection/y1 LDZ #2e SET-CELL ( put . char )
115 115
 	&no-backspace
116 116
 
117 117
 	;redraw JSR2
... ...
@@ -121,24 +121,24 @@ BRK
121 121
 @on-mouse
122 122
 	
123 123
 	.Mouse/state DEI #00 EQU ,&no-touch JCN
124
-		.Mouse/x DEI2 8/ SWP POP .selection/x1 POK
125
-		.Mouse/y DEI2 8/ SWP POP .selection/y1 POK
124
+		.Mouse/x DEI2 8/ SWP POP .selection/x1 STZ
125
+		.Mouse/y DEI2 8/ SWP POP .selection/y1 STZ
126 126
 		;redraw JSR2
127 127
 	&no-touch
128 128
 
129 129
 	( clear last cursor )
130
-	.cursor/x PEK2 .Screen/x DEO2
131
-	.cursor/y PEK2 .Screen/y DEO2
130
+	.cursor/x LDZ2 .Screen/x DEO2
131
+	.cursor/y LDZ2 .Screen/y DEO2
132 132
 	;blank_icn .Screen/addr DEO2
133 133
 	#30 .Screen/color DEO
134 134
 
135 135
 	( record cursor positions )
136
-	.Mouse/x DEI2 .cursor/x POK2
137
-	.Mouse/y DEI2 .cursor/y POK2
136
+	.Mouse/x DEI2 .cursor/x STZ2
137
+	.Mouse/y DEI2 .cursor/y STZ2
138 138
 
139 139
 	( draw new cursor )
140
-	.cursor/x PEK2 .Screen/x DEO2
141
-	.cursor/y PEK2 .Screen/y DEO2
140
+	.cursor/x LDZ2 .Screen/x DEO2
141
+	.cursor/y LDZ2 .Screen/y DEO2
142 142
 	;cursor_icn .Screen/addr DEO2
143 143
 	#32 .Mouse/state DEI #01 EQU ADD .Screen/color DEO
144 144
 	
... ...
@@ -146,9 +146,9 @@ BRK
146 146
 
147 147
 @start ( -- )
148 148
 	
149
-	#00 .grid/height PEK
149
+	#00 .grid/height LDZ
150 150
 	&ver
151
-		#00 .grid/width PEK
151
+		#00 .grid/width LDZ
152 152
 		&hor
153 153
 			( get x,y ) SWP2 OVR STH SWP2 OVR STHr
154 154
 			#2e SET-CELL
... ...
@@ -159,7 +159,7 @@ BRK
159 159
 		DUP2 LTH ,&ver JCN
160 160
 	POP2
161 161
 
162
-	#9a .timer/speed POK
162
+	#9a .timer/speed STZ
163 163
 
164 164
 RTN
165 165
 
... ...
@@ -172,7 +172,7 @@ RTN
172 172
 
173 173
 @is-selected ( x y -- flag )
174 174
 	
175
-	.selection/x1 PEK .selection/y1 PEK EQU2
175
+	.selection/x1 LDZ .selection/y1 LDZ EQU2
176 176
 
177 177
 RTN
178 178
 
... ...
@@ -236,7 +236,7 @@ RTN
236 236
 	
237 237
 	POP
238 238
 	++
239
-	#30 .timer/frame PEK #08 MOD ADD SET-CELL
239
+	#30 .timer/frame LDZ #08 MOD ADD SET-CELL
240 240
 
241 241
 RTN
242 242
 
... ...
@@ -445,9 +445,9 @@ RTN
445 445
 
446 446
 @init ( -- )
447 447
 	
448
-	#00 .grid/height PEK
448
+	#00 .grid/height LDZ
449 449
 	&ver
450
-		#00 .grid/width PEK
450
+		#00 .grid/width LDZ
451 451
 		&hor
452 452
 			( get x,y ) SWP2 OVR STH SWP2 OVR STHr
453 453
 			( unlock ) #00 SET-LOCK
... ...
@@ -464,9 +464,9 @@ RTN
464 464
 	
465 465
 	;init JSR2
466 466
 
467
-	#00 .grid/height PEK
467
+	#00 .grid/height LDZ
468 468
 	&ver
469
-		#00 .grid/width PEK
469
+		#00 .grid/width LDZ
470 470
 		&hor
471 471
 			( get x,y ) SWP2 OVR STH SWP2 OVR STHr
472 472
 			DUP2 LDA-CELL ;run-char JSR2
... ...
@@ -486,7 +486,7 @@ RTN
486 486
 
487 487
 	( Positionx )
488 488
 	#0000 .Screen/x DEO2
489
-	.selection/x1 PEK
489
+	.selection/x1 LDZ
490 490
 		DUP #04 SFT LDA-CHAR #20 SUB #00 SWP #0008 MUL2 ;font ADD2 .Screen/addr DEO2
491 491
 	#22 .Screen/color DEO
492 492
 	#0008 .Screen/x DEO2
... ...
@@ -495,7 +495,7 @@ RTN
495 495
 
496 496
 	( Positiony )
497 497
 	#0010 .Screen/x DEO2
498
-	.selection/y1 PEK
498
+	.selection/y1 LDZ
499 499
 		DUP #04 SFT LDA-CHAR #20 SUB #00 SWP #0008 MUL2 ;font ADD2 .Screen/addr DEO2
500 500
 	#22 .Screen/color DEO
501 501
 	#0018 .Screen/x DEO2
... ...
@@ -508,7 +508,7 @@ RTN
508 508
 
509 509
 	( Frame )
510 510
 	#0030 .Screen/x DEO2
511
-	.timer/frame PEK
511
+	.timer/frame LDZ
512 512
 		DUP #04 SFT LDA-CHAR #20 SUB #00 SWP #0008 MUL2 ;font ADD2 .Screen/addr DEO2
513 513
 	#22 .Screen/color DEO
514 514
 	#0038 .Screen/x DEO2
... ...
@@ -517,11 +517,11 @@ RTN
517 517
 
518 518
 	#0040 .Screen/x DEO2
519 519
 	;beat_icn .Screen/addr DEO2
520
-	#21 .timer/frame PEK #08 MOD #00 EQU #02 MUL ADD .Screen/color DEO
520
+	#21 .timer/frame LDZ #08 MOD #00 EQU #02 MUL ADD .Screen/color DEO
521 521
 
522 522
 	( Speed )
523 523
 	#0050 .Screen/x DEO2
524
-	.timer/speed PEK
524
+	.timer/speed LDZ
525 525
 		DUP #04 SFT LDA-CHAR #20 SUB #00 SWP #0008 MUL2 ;font ADD2 .Screen/addr DEO2
526 526
 	#22 .Screen/color DEO
527 527
 	#0058 .Screen/x DEO2
... ...
@@ -541,10 +541,10 @@ RTN
541 541
 
542 542
 @redraw ( -- )
543 543
 	
544
-	#00 .grid/height PEK
544
+	#00 .grid/height LDZ
545 545
 	&ver
546 546
 		( pos-y ) OVR #00 SWP #0008 MUL2 .Screen/y DEO2
547
-		#00 .grid/width PEK
547
+		#00 .grid/width LDZ
548 548
 		&hor
549 549
 			( pos-x ) OVR #00 SWP #0008 MUL2 .Screen/x DEO2
550 550
 			( get x,y ) SWP2 OVR STH SWP2 OVR STHr
... ...
@@ -42,7 +42,7 @@ Program p;
42 42
 char ops[][4] = {
43 43
 	"BRK", "LIT", "NOP", "POP", "DUP", "SWP", "OVR", "ROT",
44 44
 	"EQU", "NEQ", "GTH", "LTH", "JMP", "JCN", "JSR", "STH",
45
-	"PEK", "POK", "LDR", "STR", "LDA", "STA", "DEI", "DEO",
45
+	"LDZ", "STZ", "LDR", "STR", "LDA", "STA", "DEI", "DEO",
46 46
 	"ADD", "SUB", "MUL", "DIV", "AND", "ORA", "EOR", "SFT"
47 47
 };
48 48