2 files changed, 16 insertions(+), 16 deletions(-)

M src/main.tal
M src/strings.tal

@@ 234,6 234,7 @@ RTN
 	( get ) TOS ;card-values ++ LDA .player/hp LDZ +
 	( set ) #15 LTHk SWP? POP .player/hp STZ
 	( set sick ) #01 .player/sick STZ
+	( set xp ) .player/xp LDZ INC .player/xp STZ
 	;draw-status JSR2
 	;dialogs/potion ;draw-dialog JSR2
 	;play-potion JSR2


@@ 245,6 246,7 @@ RTN
 	POP
 	( get ) TOS ;card-values ++ LDA
 	( set ) .player/sp STZ
+	( set xp ) .player/xp LDZ INC .player/xp STZ
 	;draw-status JSR2
 	;dialogs/shield ;draw-dialog JSR2
 	;play-shield JSR2


@@ 256,6 258,7 @@ RTN
 	POP
 	( get ) TOS ;card-values ++ LDA
 	( set ) .player/hp LDZ SWP - .player/hp STZ
+	( set xp ) .player/xp LDZ INC .player/xp STZ
 	;draw-status JSR2
 	;dialogs/unshielded ;draw-dialog JSR2
 	;play-attack JSR2


@@ 268,8 271,10 @@ RTN
 
 @flip-card ( table -- )
 
-	#36 SWP .table + STZ
-	;draw-table JSR2
+	DUP .table + LDZ #36 = ,&skip JCN
+		#36 SWP .table + STZ
+		;draw-table JSR2
+	&skip
 
 RTN
 


@@ 290,7 295,7 @@ RTN
 		DUP ;flip-card JSR2
 		&no-use
 	4MOD .table/selection STZ
-	#03 ;draw-selection JSR2
+	#01 ;draw-selection JSR2
 	POP
 
 RTN


@@ 314,7 319,7 @@ RTN
 @redraw ( -- )
 
 	;draw-status JSR2
-	#03 ;draw-selection JSR2
+	#01 ;draw-selection JSR2
 	;draw-table JSR2
 
 RTN


@@ 388,14 393,15 @@ RTN
 	STH
 	.frame/x LDZ2
 	.frame/y LDZ2 #0020 ++
-		[ #00 ;get-card-name JSR2 ]
-		#02
+		.table .table/selection LDZ + LDZ
+		TOS 2** ;card-names ++ LDA2
+		STHkr #02 *
 		;draw-label JSR2
 
 	.frame/x LDZ2 #0014 ++ [ .table/selection LDZ TOS #0038 ** ++ ] .Screen/x DEO2
 	.frame/y LDZ2 #007c ++ .Screen/y DEO2
 	;cursor-up-icn .Screen/addr DEO2
-		STHr .Screen/sprite DEO
+		STHr #03 * .Screen/sprite DEO
 
 RTN
 


@@ 425,7 431,7 @@ RTN
 	.frame/y LDZ2 
 		OVR2 OVR2 #0010 ++ ;xp-txt #02 ;draw-label JSR2
 		OVR2 #0020 ++ OVR2 #0010 ++ .player/xp LDZ #02 ;draw-value JSR2
-		#20 #0a ;draw-ui-progress JSR2
+		.player/xp LDZ #0a ;draw-ui-progress JSR2
 
 RTN
 


@@ 502,12 508,6 @@ RTN
 
 RTN
 
-@get-card-name ( card -- name* )
-
-	POP ;card-names LDA2
-
-RTN
-
 @get-char ( char -- addr* )
 
 	DUP #40 > OVR #5b < #0101 !! ,&no-uc JCN

@@ 57,8 57,8 @@
 	&h0b "White_Mage_11 $1   &d0b "Red_Mage_11 $1     &s0b "Consort_11 $1  &c0b "Consort_11 $1
 	&h0c "White_Mage_11 $1   &d0c "Red_Mage_11 $1     &s0c "Queen_13 $1    &c0c "Queen_13 $1
 	&h0d "White_Mage_11 $1   &d0d "Red_Mage_11 $1     &s0d "Regnant_15 $1  &c0d "Regnant_15 $1
-	&j01 "Red_Donsol_21 $1
-	&j02 "Black_Donsol_21 $1
+	&j01 "Red_Donsol_21 $1   &j02 "Black_Donsol_21 $1
+	&b00 5f $1
 
 @card-names
 	:cards/h01 :cards/h02 :cards/h03 :cards/h04 :cards/h05