@@ 45,14 45,14 @@
|0000
+@deck
+ &length $1
+ &cards $36
@player
&hp $1 &sp $1 &sp-max $1 &xp $1
&run $1 &sick $1
@table
&a $1 &b $1 &c $1 &d $1
-@deck
- &length $1
- &cards $36
@selection $1
@cursor
&x $2 &y $2 &last $1
@@ 151,6 151,7 @@ RTN
DUP DUP .deck/cards + STZ
INC GTHk ,&loop JCN
POP2
+ #36 .deck/length STZ
RTN
@@ 160,7 161,16 @@ RTN
@pull-card ( -- card )
- #20
+ .deck/cards LDZ
+ .deck/length LDZ #01 - .deck/length STZ
+ ( shift left )
+ #3600
+ &loop
+ DUP .deck/cards +
+ ( get card ) INCk LDZ
+ ( put card ) SWP STZ
+ INC GTHk ,&loop JCN
+ POP2
RTN
@@ 201,6 211,7 @@ RTN
@draw-table ( -- )
+ ( TODO: turn into a loop )
.frame/x LDZ2
.frame/y LDZ2 #0030 ++
.table/a LDZ ;draw-card JSR2
@@ 290,7 301,7 @@ RTN
.frame/y LDZ2
OVR2 OVR2 #0010 ++ ;hp-txt #02 ;draw-label JSR2
OVR2 #0020 ++ OVR2 #0010 ++ .player/hp LDZ #01 ;draw-value JSR2
- #20 #05 ;draw-ui-progress JSR2
+ .player/hp LDZ #05 ;draw-ui-progress JSR2
( SP )
.frame/x LDZ2 #0038 ++