diff --git a/gui/teatime/teatime.tal b/gui/teatime/teatime.tal index d79fd19..d225537 100644 --- a/gui/teatime/teatime.tal +++ b/gui/teatime/teatime.tal @@ -9,7 +9,6 @@ |000 @remaining-seconds $2 - @last-second $1 @height $2 |100 @@ -40,9 +39,7 @@ [ LIT2 40 &f $1 ] INCk ,&f STR NEQ ?{ [ LIT2 00 _&f ] STR - DUP2 #0001 SUB2 DUP2 .remaining-seconds STZ2 - #0007 DIV2 .height STZ2 - } + DUP2 #0001 SUB2 } POP2 BRK @on-mouse ( -> ) @@ -68,6 +65,11 @@ #c0 ;on-frame-freeze/lock STA JMP2r +@ ( seconds* -- ) + DUP2 .remaining-seconds STZ2 + #0007 DIV2 .height STZ2 + JMP2r + @ ( distance* -- ) DUP2 .height EQU2k ?{ STZ2 @@ -79,9 +81,6 @@ @ ( -- ) - ( >> ) - -@ ( -- ) ( | markers ) ;tick-icn .Screen/addr DEO2 [ LIT2 f1 -Screen/auto ] DEO @@ -97,19 +96,19 @@ #000c .Screen/y DEO2 [ LIT2 02 -Screen/auto ] DEO [ LIT2r =label-tilemap ] #1f00 - &>w ( -- ) + &>l ( -- ) LDAkr #00 STHr INC2r ;digits ADD2 .Screen/addr DEO2 [ LIT2 05 -Screen/sprite ] DEO - INC GTHk ?&>w + INC GTHk ?&>l POP2 ( | labels, cont ) #0040 .Screen/x DEO2 #000c .Screen/y DEO2 #1f00 - &>w2 ( -- ) + &>ll ( -- ) LDAkr #00 STHr INC2r ;digits ADD2 .Screen/addr DEO2 [ LIT2 05 -Screen/sprite ] DEO - INC GTHk ?&>w2 + INC GTHk ?&>ll POP2 POP2r JMP2r @ ( -- ) @@ -167,18 +166,11 @@ ( @|assets ) -@pointer-icn [ 80c0 e0f0 f8e0 1000 ] - &drag [ c381 0000 0000 81c3 ] - @hand-icn [ 4040 787c fcfc 7c38 ] &down [ 0000 787c fcfc 7c38 ] -@arrow-icn [ 80c0 e0f0 f8fc f0c0 ] - @tick-icn [ 7e00 0000 7000 0000 ] -@blank-icn [ 0000 0000 0000 0000 ] - @fill-icn [ ffff ffff ffff ffff ] @line-icn [ ff00 0000 0000 0000 ]