code cleanup

projects/nibble-dice-tracker.tal

@@ -43,6 +43,7 @@
 %dev-width { #0044 } ( col-sep + col-width )
 %num-devices { #03 }
 %num-cols { #06 }
+%dev-total-width { #00cc } ( 204: 3*(col-sep + col-width)
 
 
 ( variables )
@@ -89,9 +90,7 @@
 	;pos-y-dev STA2
 
 	.Screen/width DEI2
-	col-sep #00 num-devices MUL2 
-	col-width #00 num-devices MUL2
-	ADD2 ( add column widths )
+	dev-total-width
 	SUB2 #0004 DIV2 ( calculate separation between devices )
 	;pos-x-devsep STA2
 
@@ -124,12 +123,6 @@ BRK
 00
 
 @pos-x-devsep 0000
-@pos-x-dev00  000c 
-@pos-x-dev01  000c 
-@pos-x-dev10  005e 
-@pos-x-dev11  005e 
-@pos-x-dev20  00af 
-@pos-x-dev21  00af 
 @pos-y-dev   0020
 
 @samples
@@ -144,13 +137,17 @@ BRK
 	#01 ;update-dev JSR2
 	#02 ;update-dev JSR2
 
-	;draw-registers JSR2
+	,draw-registers JSR
 
 	( inc framecount )
 	.framecount LDZ2 #0001 ADD2 .framecount STZ2
 BRK
 
 @draw-registers ( -- )
+	,&start JMP
+	&pos-x $2
+  &offset $1
+	&start
 	#00 
 	&loop
 		STHk ( stash but keep counter )
@@ -161,23 +158,16 @@ BRK
 		STHkr #00 SWP
 		dev-width MUL2 ( get amount of previous devices )
 		ADD2 ( calculate x )
+		DUP2 ,&pos-x STR2
 		;pos-y-dev LDA2  ( load y coordinate )
 		STHkr ( retrieve but keep counter )
-		#10 MUL ( calculate byte offset )
+		#10 MUL STHk ( calculate, stash but keep byte offset )
 		;draw-bytes JSR2
 
-		STHkr ( retrieve but keep counter )
-		#00 SWP ( make short )
-		#0001 ADD2 ( add 1 )
-		;pos-x-devsep LDA2 ( load x separation )
-		MUL2 ( get amount of separation ) 
-		STHkr #00 SWP
-		dev-width MUL2 ( get amount of previous devices )
-		ADD2 ( calculate x )
-		col-sep ADD2 ( add separation )
+		,&pos-x LDR2
+		col-sep ADD2 ( add separation to x )
 		;pos-y-dev LDA2  ( load y coordinate )
-		STHkr ( retrieve but keep counter )
-		#10 MUL ( calculate byte offset )
+		STHr ( retrieve offset )
 		#08 ADD
 		;draw-bytes JSR2
 
@@ -240,11 +230,11 @@ RTN
 
 	&draw-beat
 	( draw beat )
-  ;pos-x-devsep LDA2 #00 .offset LDZ  MUL2 ( calculate x )
-	col-sep #00 .offset LDZ MUL2 ADD2 
+  ;pos-x-devsep LDA2 col-sep ADD2
+	#00 .offset LDZ  MUL2 ( calculate x )
 	#00 .offset LDZ #01 SUB col-width MUL2 ADD2
-	#000c ADD2
-	 STHr ( get played )  STHr ( get beat ) SWP  ;draw-beat JSR2 
+	#000c ADD2 ( center in column )
+	 STHr ( get played )  STHr ( get beat ) SWP  ,draw-beat JSR
 RTN
 
 
@@ -319,10 +309,10 @@ RTN
    dec-ptr-reg-nib
    POP BRK
   &inc-nibble ( increment nibble )
-		#01 ;add-to-nibble JSR2
+		#01 ,add-to-nibble JSR
    POP BRK
   &dec-nibble ( dec nibble )
-		#ff ;add-to-nibble JSR2
+		#ff ,add-to-nibble JSR
    POP BRK
 BRK