M src/assets.tal => src/assets.tal +5 -37
@@ 1,12 1,13 @@
-
@pointer-icn
80c0 e0f0 f8e0 1000
-
@cursor-hor-icn
4060 381e 1e38 6040
-@cursor-up-icn
+@cursor-ver-icn
0018 183c 7e66 c300
-
+@progress-fg-icn
+ 0000 183c 3c18 0000
+@star-icn
+ 082a 1c7f 1c2a 0800
@progress-bg-icns
3f40 8080 8080 403f
ff00 0000 0000 00ff
@@ 14,13 15,6 @@
ff00 0000 0000 00ff
ff00 0000 0000 00ff
fc02 0101 0101 02fc
-
-@progress-fg-icn
- 0000 183c 3c18 0000
-
-@star-icn
- 082a 1c7f 1c2a 0800
-
@font
@blank-icn
0000 0000 0000 0000
@@ 35,7 29,6 @@
807e 3e0c 1830 60c0
807c cece 7cce ce7c
807c cece 7c18 3060
-
@letters-uc-icns
781c 3c36 3e66 66c3
ee73 636e 6363 63de
@@ 63,7 56,6 @@
c3c3 663c 3c66 c3c3
c366 663c 1818 1818
7ec6 0c18 fe60 c3fe
-
@letters-lc-icns
0000 3e66 6666 3b00
e060 607c 6666 7c00
@@ 91,37 83,13 @@
0003 663c 183c 66c0
0000 e666 663e cc78
0000 7e0c 7e31 7e00
-@punctuations-icns
0c0c 1818 0030 3000
0000 0000 0030 3000
@buttons-icns
- &a
3c66 dbdb c3db 5a3c
&b
3c46 dbc7 dbdb 463c
-@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
- ffff ffff ffff ffff efc7 8301 83c7 efff
- c739 3939 3939 39c7 c739 3939 3939 39c7
- 7387 e7e7 e7e7 e781 7387 e7e7 e7e7 e781
- c3b1 79f1 e3c7 8901 c3b1 79f1 e3c7 8901
- 7f81 f3ef 93f1 7183 7f81 f3ef 93f1 7183
- f1e3 e3c3 9300 f3e1 f1e3 e3c3 9300 f3e1
- 3907 bf3f 03f1 3183 3907 bf3f 03f1 3183
- c53b 3f3f 0331 3183 c53b 3f3f 0331 3183
- 7f81 c1f3 e7cf 9f3f 7f81 c1f3 e7cf 9f3f
- 7f83 3131 8331 3183 7f83 3131 8331 3183
- 7f83 3131 83e7 cf9f 7f83 3131 83e7 cf9f
- 3c3c 99c3 c399 3c3c 3c3c 99c3 c399 3c3c
- e1f3 f3f3 f3e3 c79f e1f3 f3f3 f3e3 c79f
- 8319 3939 3939 3180 8319 3939 3939 3180
- 3993 9387 8793 9339 3993 9387 8793 9339
- 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 +13 -54
@@ 430,17 430,16 @@ RTN
POP
.player/sick LDZ #01 ! ,&no-sick JCN
;dialogs/sickness ;draw-dialog JSR2
- ;play-error JSR2 POP RTN
+ POP RTN
&no-sick
.player/hp LDZ #15 ! ,&no-waste JCN
;dialogs/waste ;draw-dialog JSR2
- ;play-error JSR2 POP RTN
+ POP RTN
&no-waste
( get ) TOS ;card-values ++ LDA .player/hp LDZ +
( set ) #15 LTHk SWP? POP .player/hp STZ
( set sick ) #01 .player/sick STZ
;dialogs/potion ;draw-dialog JSR2
- ;play-potion JSR2
RTN
@@ 452,7 451,6 @@ RTN
( set max durability ) #16 .player/dp STZ
( set sick ) #00 .player/sick STZ
;dialogs/shield ;draw-dialog JSR2
- ;play-shield JSR2
RTN
@@ 467,7 465,6 @@ RTN
( damages ) ;take-damages JSR2
( test death ) .player/hp LDZ #00 = ;&death JCN2
;dialogs/unshielded ;draw-dialog JSR2
- ;play-attack JSR2
RTN
&shielding ( value -- )
@@ 477,7 474,6 @@ RTN
( damages ) .player/sp LDZ - ;take-damages JSR2
( test death ) .player/hp LDZ #00 = ,&death JCN
;dialogs/damages ;draw-dialog JSR2
- ;play-shielding JSR2
RTN
&breaking ( value -- )
@@ 485,18 481,15 @@ RTN
( damages ) ;take-damages JSR2
( test death ) .player/hp LDZ #00 = ,&death JCN
;dialogs/breaking ;draw-dialog JSR2
- ;play-breaking JSR2
RTN
&blocking ( value -- )
( durability ) .player/dp STZ
;dialogs/blocking ;draw-dialog JSR2
- ;play-blocking JSR2
RTN
&death ( -- )
;dialogs/death ;draw-dialog JSR2
- ;play-death JSR2
RTN
@@ 652,38 645,6 @@ RTN
RTN
-@play-error ( -- )
-
-RTN
-
-@play-potion ( -- )
-
-RTN
-
-@play-shield ( -- )
-
-RTN
-
-@play-attack ( -- )
-
-RTN
-
-@play-shielding ( -- )
-
-RTN
-
-@play-blocking ( -- )
-
-RTN
-
-@play-breaking ( -- )
-
-RTN
-
-@play-death ( -- )
-
-RTN
-
@redraw ( -- )
;draw-status JSR2
@@ 695,22 656,20 @@ RTN
@draw-table ( -- )
- ( TODO: turn into a loop )
- .frame/x LDZ2
- .frame/y LDZ2 #0030 ++
+ .frame/x LDZ2 .frame/y LDZ2
+ OVR2
+ OVR2 #0030 ++
.table/a LDZ ;draw-card JSR2
-
- .frame/x LDZ2 #0038 ++
- .frame/y LDZ2 #0030 ++
+ OVR2 #0038 ++
+ OVR2 #0030 ++
.table/b LDZ ;draw-card JSR2
-
- .frame/x LDZ2 #0070 ++
- .frame/y LDZ2 #0030 ++
+ OVR2 #0070 ++
+ OVR2 #0030 ++
.table/c LDZ ;draw-card JSR2
-
- .frame/x LDZ2 #00a8 ++
- .frame/y LDZ2 #0030 ++
+ OVR2 #00a8 ++
+ OVR2 #0030 ++
.table/d LDZ ;draw-card JSR2
+ POP2 POP2
RTN
@@ 796,7 755,7 @@ RTN
.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
+ ;cursor-ver-icn .Screen/addr DEO2
STHr #03 * .Screen/sprite DEO
RTN
M src/strings.tal => src/strings.tal +1 -4
@@ 1,7 1,6 @@
@dialogs
- &clear 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
- &entered 2333 3900 2932 3829 3629 2800 382c 2900 3633 3331 4000 0000
+ ( clear ) 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
( potion )
&potion 2333 3900 2836 2532 2f00 2500 3433 382d 3332 4000 0000 0000
&sickness 2333 3900 2a29 2930 0037 2d27 2f40 0000 0000 0000 0000 0000
@@ 23,8 22,6 @@
&hard 1225 3628 0017 3328 2900 4100 1d29 3029 2738 0027 2536 2840
( etc )
&victory 202d 2738 3336 3d00 4100 1629 253a 2900 2839 322b 2933 3240
- &sound:ON 1d33 3932 2837 0019 183f 0000 0000 0000 0000 0000 0000 0000
- &sound:OFF 1d33 3932 2837 0019 1010 3f00 0000 0000 0000 0000 0000 0000
&modes
:&easy :&normal :&hard