1 files changed, 15 insertions(+), 17 deletions(-)

M src/donsol.tal

@@ 1,30 1,29 @@
 ( Donsol )
 
-|00 @System     &vector $2 &pad     $6 &r      $2 &g     $2 &b     $2
-|20 @Screen     &vector $2 &width   $2 &height $2 &auto  $1 &pad   $1 &x     $2 &y $2 &addr $2 &pixel $1 &sprite $1
-|80 @Controller &vector $2 &button  $1 &key    $1
-|90 @Mouse      &vector $2 &x       $2 &y      $2 &state $1 &chord $1
-|a0 @File       &vector $2 &success  $2 &stat   $2 &delete $1 &append $1 &name   $2 &length $2 &read   $2 &write $2
-|c0 @DateTime   &year   $2 &month   $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty   $2 &isdst $1
+|00 @System &vector $2 &pad $6 &r $2 &g $2 &b $2
+|20 @Screen &vector $2 &width $2 &height $2 &auto $1 &pad $1 &x $2 &y $2 &addr $2 &pixel $1 &sprite $1
+|80 @Controller &vector $2 &button $1 &key $1
+|90 @Mouse &vector $2 &x $2 &y $2 &state $1 &chord $1
+|a0 @File &vector $2 &success $2 &stat $2 &delete $1 &append $1 &name $2 &length $2 &read $2 &write $2
+|c0 @DateTime &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1
 
 |0000
 
 @mode $1
 @score $1
 @deck
-	&length $1
-	&cards $36
-@player
-	&hp $1 &hp-tween $1
-	&sp $1 &sp-tween $1
-	&dp $1 &xp $1
-	&ran $1 &sick $1
+	&length $1 &cards $36
 @table
 	&a $1 &b $1 &c $1 &d $1 &selection $1 &timer $1
 @cursor
 	&x $2 &y $2 &last $1
 @frame
 	&x $2 &y $2 &x2 $2 &y2 $2
+@player
+	&hp $1 &hp-tween $1
+	&sp $1 &sp-tween $1
+	&dp $1 &xp $1
+	&ran $1 &sick $1
 
 |0100 ( -> )
 


@@ 63,10 62,9 @@ BRK
 
 @go-menu ( -- )
 
-	;on-button-menu   .Controller/vector DEO2
-	;on-mouse-menu    .Mouse/vector DEO2
-	;on-frame-menu    .Screen/vector DEO2
-
+	;on-button-menu .Controller/vector DEO2
+	;on-mouse-menu .Mouse/vector DEO2
+	;on-frame-menu .Screen/vector DEO2
 	;clear-screen JSR2
 	;draw-menu JSR2