1 files changed, 28 insertions(+), 33 deletions(-)

M src/dexe.tal

@@ 220,8 220,8 @@ BRK
 @on-button ( -> )
 
 	.Controller/button DEI2
-		DUP2 #0000 EQU2 ,&skip JCN
-			;find-modkey JSR2 DUP2 #0000 EQU2 ,&skip JCN
+		ORAk #00 EQU ,&skip JCN
+			;find-modkey JSR2 ORAk #00 EQU ,&skip JCN
 				DUP2 JSR2
 				( block ) POP2 BRK
 		&skip


@@ 417,12 417,10 @@ JMP2
 	DUP ;chex JSR2 #ff EQU ,&skip JCN
 	.selection/nibble LDZ ,&low JCN
 		#01 .selection/nibble STZ
-		;chex JSR2 #40 SFT .selection/from LDZ2 LDA #0f AND ADD ;fill-selection JSR2
-		JMP2r
+		;chex JSR2 #40 SFT .selection/from LDZ2 LDA #0f AND ADD ;fill-selection JMP2
 	&low
 		#00 .selection/nibble STZ
-		;chex JSR2 .selection/from LDZ2 LDA #f0 AND ADD ;fill-selection JSR2
-		JMP2r
+		;chex JSR2 .selection/from LDZ2 LDA #f0 AND ADD ;fill-selection JMP2
 	&skip
 		POP
 


@@ 480,8 478,7 @@ JMP2
 
 	&up
 		.selection/from LDZ2 #0001 SUB2 
-			;data SUB2 #03 SFT2 ;set-scroll JSR2
-		JMP2r
+			;data SUB2 #03 SFT2 ;set-scroll JMP2
 
 	&down
 		.selection/to LDZ2 [ .frame/rows LDZ2 #30 SFT2 ] SUB2 #0008 ADD2 


@@ 578,9 575,9 @@ JMP2
 @redraw ( -- )
 
 	;draw-options JSR2
-	,draw-table JSR
+	,draw-table ( .. )
 
-JMP2r
+JMP
 
 @draw-spacer ( -- )
 


@@ 617,7 614,7 @@ JMP2
 	.frame/x LDZ2 .Screen/x DEO2
 	;&y LDA2 .Screen/y DEO2
 
-	#08 #00
+	#0800
 	&bytes-loop
 		( color ) #00 OVR ;&row LDA2 ADD2 ;get-byte-color JSR2 STH
 		( byte ) #00 OVR ;&row LDA2 ADD2 LDA


@@ 631,7 628,7 @@ JMP2
 
 	.char-frame/x LDZ2 .Screen/x DEO2
 
-	#08 #00
+	#0800
 	&chars-loop
 		( color ) #00 OVR ;&row LDA2 ADD2 ;get-byte-color JSR2 STH
 		( byte ) #00 OVR ;&row LDA2 ADD2 LDA


@@ 661,10 658,10 @@ JMP2r
 
 	POP
 	,&addr STR2 ,&y STR2 ,&x STR2
-	#08 #00
+	#0800
 	&ver
 		DUPk ADD #00 SWP [ LIT2 &y $2 ] ADD2 .Screen/y DEO2
-		#08 #00
+		#0800
 		&hor
 			DUPk ADD #00 SWP [ LIT2 &x $2 ] ADD2 .Screen/x DEO2
 			( get pixel ) OVR2 NIP OVR SWP


@@ 698,8 695,7 @@ JMP2r
 @draw-asm-row ( addr* byte -- )
 
 	DUP ;is-literal JSR2 ,&literal JCN
-	STH ;get-byte-color JSR2 STHr SWP ;draw-opcode JSR2
-	JMP2r
+	STH ;get-byte-color JSR2 STHr SWP ;draw-opcode JMP2
 	&literal
 	DUP #20 AND ,&literal-short JCN
 	POP DUP2 ;get-byte-color JSR2 STH


@@ 817,8 813,7 @@ JMP2
 
 JMP2
 	&unused 
-		NIP ;&unknown-txt ROT ;draw-string JSR2
-	JMP2r
+		NIP ;&unknown-txt ROT ;draw-string JMP2
 	&unknown-txt "?????? $1
 	"..... &fill-end $2
 


@@ 997,21 992,21 @@ JMP2r
 
 JMP2
 
-@move-up ( -- ) .selection/from LDZ2 #0008 SUB2 ;select JSR2 JMP2r
-@move-down ( -- ) .selection/from LDZ2 #0008 ADD2 ;select JSR2 JMP2r
-@move-left ( -- ) .selection/from LDZ2 #0001 SUB2 ;select JSR2 JMP2r
-@move-right ( -- ) .selection/from LDZ2 INC2 ;select JSR2 JMP2r
-@move-dech ( -- ) .selection/to LDZ2 #0008 SUB2 ;select-until JSR2 JMP2r
-@move-inch ( -- ) .selection/to LDZ2 #0008 ADD2 ;select-until JSR2 JMP2r
-@move-decw ( -- ) .selection/to LDZ2 #0001 SUB2 ;select-until JSR2 JMP2r
-@move-incw ( -- ) .selection/to LDZ2 INC2 ;select-until JSR2 JMP2r
-
-@option-insert ( -- ) .selection/from LDZ2 ;memsftr JSR2 JMP2r
-@option-erase ( -- ) .selection/from LDZ2 ;memsftl JSR2 JMP2r
-@option-incr ( -- ) ;do-inc ;do JSR2 JMP2r
-@option-decr ( -- ) ;do-dec ;do JSR2 JMP2r
-@option-roll ( -- ) ;do-rol ;do JSR2 JMP2r
-@option-rolr ( -- ) ;do-ror ;do JSR2 JMP2r
+@move-up ( -- ) .selection/from LDZ2 #0008 SUB2 ;select JMP2
+@move-down ( -- ) .selection/from LDZ2 #0008 ADD2 ;select JMP2
+@move-left ( -- ) .selection/from LDZ2 #0001 SUB2 ;select JMP2
+@move-right ( -- ) .selection/from LDZ2 INC2 ;select JMP2
+@move-dech ( -- ) .selection/to LDZ2 #0008 SUB2 ;select-until JMP2
+@move-inch ( -- ) .selection/to LDZ2 #0008 ADD2 ;select-until JMP2
+@move-decw ( -- ) .selection/to LDZ2 #0001 SUB2 ;select-until JMP2
+@move-incw ( -- ) .selection/to LDZ2 INC2 ;select-until JMP2
+
+@option-insert ( -- ) .selection/from LDZ2 ;memsftr JMP2
+@option-erase ( -- ) .selection/from LDZ2 ;memsftl JMP2
+@option-incr ( -- ) ;do-inc ;do JMP2
+@option-decr ( -- ) ;do-dec ;do JMP2
+@option-roll ( -- ) ;do-rol ;do JMP2
+@option-rolr ( -- ) ;do-ror ;do JMP2
 
 ( generics )