M src/assets.tal => src/assets.tal +1 -2
@@ 98,7 98,7 @@
3c66 dbdb c3db 5a3c
3c46 dbc7 dbdb 463c
-@glyphs-icn
+@glyphs-icns
efc7 8301 01ab c7ff efc7 8301 01ab c7ff
c7c7 0101 01ef c7ff c7c7 0101 01ef c7ff
ffff ffff ffff ffff 9301 0101 83c7 efff
@@ 120,7 120,6 @@
87e3 c3c9 c199 993c 87e3 c3c9 c199 993c
118c 9c9c 9c9c 9c21 118c 9c9c 9c9c 9c21
-
@graphics
8182 8282 8283 8542 8686 8687 8552 8686 8687 85e8 e4e5 e987 85ec e0e1 ed87 85f8 f5f6 fb87 8586 f9fa 8687 85fc fdfe ff87 89ee ebea ef8b ( heart1 )
8182 8282 8283 8542 8686 8687 8546 8686 8687 8586 8686 8687 8586 4286 8687 8586 8642 8687 8586 8686 8687 8586 8686 8687 898a 8a8a 8a8b ( heart2 )
M src/main.tal => src/main.tal +12 -3
@@ 161,8 161,8 @@ BRK
;init-deck JSR2
;shuffle-deck JSR2
;pull-card JSR2 #00 ;put-card JSR2
- #2d #01 ;put-card JSR2
- #18 #02 ;put-card JSR2
+ #27 #01 ;put-card JSR2
+ #15 #02 ;put-card JSR2
#21 #03 ;put-card JSR2
;redraw JSR2
@@ 271,16 271,20 @@ RTN
&shielded ( value -- )
( check if breaking shield )
DUP INC .player/dp LDZ > ,&breaking JCN
+ ( durability ) DUP .player/dp STZ
POP
+ ;draw-status JSR2
;dialogs/shielding ;draw-dialog JSR2
RTN
&blocking ( value -- )
POP
+ ;draw-status JSR2
;dialogs/blocking ;draw-dialog JSR2
RTN
&breaking ( value -- )
+ ;draw-status JSR2
;dialogs/breaking ;draw-dialog JSR2
POP
@@ 446,6 450,11 @@ RTN
OVR2 OVR2 #0010 ++ ;sp-txt #02 ;draw-label JSR2
OVR2 #0020 ++ OVR2 #0010 ++ .player/sp-tween LDZ #03 ;draw-value JSR2
.player/sp-tween LDZ #0f ;draw-ui-progress JSR2
+ ( durability )
+ .frame/x LDZ2 #0048 ++ .Screen/x DEO2
+ .frame/y LDZ2 #0010 ++ .Screen/y DEO2
+ .player/dp LDZ TOS ;card-glyphs ++ LDA ;get-char JSR2 .Screen/addr DEO2
+ #03 .Screen/sprite DEO
( XP )
.frame/x LDZ2 #0070 ++
@@ 540,7 549,7 @@ RTN
DUP #2f > OVR #3a < #0101 !! ,&no-num JCN
#30 - TOS 8** ;numbers-icns ++ RTN
&no-num
- DUP #5f ! ,&no-space JCN
+ DUP #5f ! OVR #00 ! #0000 == ,&no-space JCN
POP ;blank-icn RTN
&no-space
POP ;star-icn
M src/strings.tal => src/strings.tal +3 -3
@@ 47,9 47,9 @@
15 15 00 ( joker )
@card-glyphs
- 00 02 03 04 05 06 07 08 09 0a
- 22 14 20 1b 00 15 08 0b 00 00
- 00 0e 00
+ 00 31 32 33 34 35 36 37
+ 38 39 58 4a 00 51 00 4b
+ 00 41 00 00 00 00 00 00
@cards
&h01 "White_Mage_11 $1 &d01 "Red_Mage_11 $1 &s01 "Empress_17 $1 &c01 "Empress_17 $1