M src/assets.tal => src/assets.tal +18 -12
@@ 21,8 21,20 @@
@star-icn
082a 1c7f 1c2a 0800
+@font
@blank-icn
0000 0000 0000 0000
+@numbers-icns
+ 38c6 c6c6 c6c6 c638
+ 8c78 1818 1818 187e
+ 3c4e 860e 1c38 72fe
+ 807e 0c10 7c0e 8e7c
+ 0e1c 1c3c 6cff 0c1e
+ c6f8 40c0 fc0e ce7c
+ 3ac4 c0c0 fcce ce7c
+ 807e 3e0c 1830 60c0
+ 807c cece 7cce ce7c
+ 807c cece 7c18 3060
@letters-uc-icns
781c 3c36 3e66 66c3
@@ 79,18 91,12 @@
0003 663c 183c 66c0
0000 e666 663e cc78
0000 7e0c 7e31 7e00
-
-@numbers-icns
- 38c6 c6c6 c6c6 c638
- 8c78 1818 1818 187e
- 3c4e 860e 1c38 72fe
- 807e 0c10 7c0e 8e7c
- 0e1c 1c3c 6cff 0c1e
- c6f8 40c0 fc0e ce7c
- 3ac4 c0c0 fcce ce7c
- 807e 3e0c 1830 60c0
- 807c cece 7cce ce7c
- 807c cece 7c18 3060
+@punctuations-icns
+ 0c0c 1818 0030 3000
+ 0000 0000 0030 3000
+@buttons-icns
+ 3c66 dbdb c3db 5a3c
+ 3c46 dbc7 dbdb 463c
@glyphs-icn
efc7 8301 01ab c7ff efc7 8301 01ab c7ff
M src/main.tal => src/main.tal +42 -81
@@ 126,29 126,48 @@ RTN
@draw-table ( -- )
.frame/x LDZ2
- .frame/y LDZ2 #0030 ++
+ .frame/y LDZ2 #0038 ++
#00 ;draw-card JSR2
.frame/x LDZ2 #0038 ++
- .frame/y LDZ2 #0030 ++
- #01 ;draw-card JSR2
+ .frame/y LDZ2 #0038 ++
+ #21 ;draw-card JSR2
.frame/x LDZ2 #0070 ++
- .frame/y LDZ2 #0030 ++
- #02 ;draw-card JSR2
+ .frame/y LDZ2 #0038 ++
+ #13 ;draw-card JSR2
.frame/x LDZ2 #00a8 ++
- .frame/y LDZ2 #0030 ++
- #03 ;draw-card JSR2
+ .frame/y LDZ2 #0038 ++
+ #36 ;draw-card JSR2
.frame/x LDZ2 #0014 ++ .Screen/x DEO2
- .frame/y LDZ2 #0080 ++ .Screen/y DEO2
+ .frame/y LDZ2 #0084 ++ .Screen/y DEO2
;cursor-up-icn .Screen/addr DEO2
#03 .Screen/sprite DEO
.frame/x LDZ2
.frame/y LDZ2 #0090 ++
- ;placeholder-txt #02 ;draw-label JSR2
+ #03 ;draw-dialog JSR2
+
+RTN
+
+@draw-dialog ( x* y* id -- )
+
+ STH
+ .Screen/y DEO2
+ .Screen/x DEO2
+ ( auto x ) #01 .Screen/auto DEO
+ #1800
+ &loop
+ ( get offset ) DUP TOS
+ ( find dialog ) STHkr TOS #0018 ** ;dialogs ++
+ ( get char ) ++ LDA TOS 8** ;font ++ .Screen/addr DEO2
+ #02 .Screen/sprite DEO
+ INC GTHk ,&loop JCN
+ POP2
+ ( auto none ) #00 .Screen/auto DEO
+ POPr
RTN
@@ 180,9 199,9 @@ RTN
@draw-selection ( -- )
.frame/x LDZ2
- .frame/y LDZ2 #0020 ++
+ .frame/y LDZ2 #0028 ++
[ #00 ;get-card-name JSR2 ]
- #03
+ #02
;draw-label JSR2
RTN
@@ 192,23 211,23 @@ RTN
( HP )
.frame/x LDZ2
.frame/y LDZ2
- OVR2 OVR2 #0010 ++ ;hp-txt #03 ;draw-label JSR2
- OVR2 #0020 ++ OVR2 #0010 ++ .player/hp LDZ #02 ;draw-value JSR2
- #02 #0a ;draw-ui-progress JSR2
+ 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
( SP )
.frame/x LDZ2 #0038 ++
.frame/y LDZ2
- OVR2 OVR2 #0010 ++ ;sp-txt #03 ;draw-label JSR2
- OVR2 #0020 ++ OVR2 #0010 ++ .player/sp LDZ #01 ;draw-value JSR2
- #12 #05 ;draw-ui-progress JSR2
+ OVR2 OVR2 #0010 ++ ;sp-txt #02 ;draw-label JSR2
+ OVR2 #0020 ++ OVR2 #0010 ++ .player/sp LDZ #03 ;draw-value JSR2
+ #12 #0f ;draw-ui-progress JSR2
( XP )
.frame/x LDZ2 #0070 ++
.frame/y LDZ2
- OVR2 OVR2 #0010 ++ ;xp-txt #03 ;draw-label JSR2
- OVR2 #0020 ++ OVR2 #0010 ++ .player/xp LDZ #03 ;draw-value JSR2
- #20 #0f ;draw-ui-progress JSR2
+ 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
RTN
@@ 220,7 239,7 @@ RTN
( set addr ) ;progress-bg-icns .Screen/addr DEO2
#0600
&bg
- ( draw ) #03 .Screen/sprite DEO
+ ( draw ) #02 .Screen/sprite DEO
INC GTHk ,&bg JCN
POP2
( auto none ) #00 .Screen/auto DEO
@@ 367,63 386,5 @@ RTN
RTN
-( strings )
-
-@placeholder-txt "You_survived_the_battle $1
-
-@hp-txt "HP $1
-@sp-txt "SP $1
-@xp-txt "XP $1
-
-@card-types
- 00 00 00 00 00 00 00 00 00 00 00 00 00 ( hearts )
- 01 01 01 01 01 01 01 01 01 01 01 01 01 ( diamonds )
- 02 02 02 02 02 02 02 02 02 02 02 02 02 ( spades )
- 03 03 03 03 03 03 03 03 03 03 03 03 03 ( clovers )
- 04 04 05 ( joker )
-
-@card-values
- 0b 02 03 04 05 06 07 08 09 0a 0b 0b 0b ( heart )
- 0b 02 03 04 05 06 07 08 09 0a 0b 0b 0b ( diamonds )
- 11 02 03 04 05 06 07 08 09 0a 0b 0d 0f ( spades )
- 11 02 03 04 05 06 07 08 09 0a 0b 0d 0f ( clovers )
- 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
-
-@cards
- &h01 "White_Mage_11 $1 &d01 "Red_Mage_11 $1 &s01 "Empress_17 $1 &c01 "Empress_17 $1
- &h02 "Small_Potion_2 $1 &d02 "Buckler_2 $1 &s02 "Slime_2 $1 &c02 "Rat_2 $1
- &h03 "Small_Potion_3 $1 &d03 "Buckler_3 $1 &s03 "Tunneler_3 $1 &c03 "Bat_3 $1
- &h04 "Medium_Potion_4 $1 &d04 "Kite_4 $1 &s04 "Fiend_4 $1 &c04 "Imp_4 $1
- &h05 "Medium_Potion_5 $1 &d05 "Kite_5 $1 &s05 "Drake_5 $1 &c05 "Goblin_5 $1
- &h06 "Large_Potion_6 $1 &d06 "Heater_6 $1 &s06 "Specter_6 $1 &c06 "Orc_6 $1
- &h07 "Large_Potion_7 $1 &d07 "Heater_7 $1 &s07 "Ghost_7 $1 &c07 "Ogre_7 $1
- &h08 "Super_Potion_8 $1 &d08 "Tower_Shield_8 $1 &s08 "Elemental_8 $1 &c08 "Beholder_8 $1
- &h09 "Super_Potion_9 $1 &d09 "Tower_Shield_9 $1 &s09 "Witch_9 $1 &c09 "Medusa_9 $1
- &h0a "Super_Potion_10 $1 &d0a "Tower_Shield_10 $1 &s0a "Familiar_10 $1 &c0a "Demon_10 $1
- &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
-
-@deck
- :cards/h01 :cards/h02 :cards/h03 :cards/h04 :cards/h05
- :cards/h06 :cards/h07 :cards/h08 :cards/h09 :cards/h0a
- :cards/h0b :cards/h0c :cards/h0d
- :cards/d01 :cards/d02 :cards/d03 :cards/d04 :cards/d05
- :cards/d06 :cards/d07 :cards/d08 :cards/d09 :cards/d0a
- :cards/d0b :cards/d0c :cards/d0d
- :cards/s01 :cards/s02 :cards/s03 :cards/s04 :cards/s05
- :cards/s06 :cards/s07 :cards/s08 :cards/s09 :cards/s0a
- :cards/s0b :cards/s0c :cards/s0d
- :cards/c01 :cards/c02 :cards/c03 :cards/c04 :cards/c05
- :cards/c06 :cards/c07 :cards/c08 :cards/c09 :cards/c0a
- :cards/c0b :cards/c0c :cards/c0d
- :cards/j01 :cards/j02
-
-include src/assets.tal>
\ No newline at end of file
+include src/strings.tal
+include src/assets.tal
A src/strings.tal => src/strings.tal +76 -0
@@ 0,0 1,76 @@
+
+@dialogs
+ &clear 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
+ &sickness 2333 3900 2a29 2930 0037 2d27 2f69 0000 0000 0000 0000 0000
+ &shieldbreak 2333 3936 0037 2c2d 2930 2800 2636 332f 2968 0000 0000 0000
+ &death 2333 3900 282d 2928 4000 4100 1e36 3d00 252b 252d 3240 0000
+ &cannot_run 2333 3900 2725 3232 3338 0036 3932 0025 3b25 3d40 0000 0000
+ &shield 2333 3900 2a33 3932 2800 2500 372c 2d29 3028 4000 0000 0000
+ &potion 2333 3900 2836 2532 2f00 2500 3433 382d 3332 4000 0000 0000
+ &wastedpotion 2333 3900 3b25 3738 2928 0025 0034 3338 2d33 3268 0000 0000
+ &unshielded 193b 6800 2333 3900 3229 2928 0025 0037 2c2d 2930 2840 0000
+ &attack 2333 3900 2932 3829 3629 2800 382c 2900 3633 3331 4000 0000
+ &shielded 2333 3900 2630 3327 2f29 2800 382c 2900 2538 3825 272f 4000
+ &damages 2333 3900 3739 363a 2d3a 2928 0038 2c29 0026 2538 3830 2940
+ &run 2333 3900 3625 3200 253b 253d 4000 0000 0000 0000 0000 0000
+ &easy_mode 0f25 373d 0017 3328 2900 6c00 1d29 3029 2738 0027 2536 2840
+ &normal_mode 1833 3631 2530 006c 001d 2930 2927 3800 2725 3628 4000 0000
+ &hard_mode 1225 3628 0017 3328 2900 6c00 1d29 3029 2738 0027 2536 2840
+ &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
+
+@hp-txt "HP $1
+@sp-txt "SP $1
+@xp-txt "XP $1
+
+@card-types
+ 00 00 00 00 00 00 00 00 00 00 00 00 00 ( hearts )
+ 01 01 01 01 01 01 01 01 01 01 01 01 01 ( diamonds )
+ 02 02 02 02 02 02 02 02 02 02 02 02 02 ( spades )
+ 03 03 03 03 03 03 03 03 03 03 03 03 03 ( clovers )
+ 04 04 05 ( joker )
+
+@card-values
+ 0b 02 03 04 05 06 07 08 09 0a 0b 0b 0b ( heart )
+ 0b 02 03 04 05 06 07 08 09 0a 0b 0b 0b ( diamonds )
+ 11 02 03 04 05 06 07 08 09 0a 0b 0d 0f ( spades )
+ 11 02 03 04 05 06 07 08 09 0a 0b 0d 0f ( clovers )
+ 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
+
+@cards
+ &h01 "White_Mage_11 $1 &d01 "Red_Mage_11 $1 &s01 "Empress_17 $1 &c01 "Empress_17 $1
+ &h02 "Small_Potion_2 $1 &d02 "Buckler_2 $1 &s02 "Slime_2 $1 &c02 "Rat_2 $1
+ &h03 "Small_Potion_3 $1 &d03 "Buckler_3 $1 &s03 "Tunneler_3 $1 &c03 "Bat_3 $1
+ &h04 "Medium_Potion_4 $1 &d04 "Kite_4 $1 &s04 "Fiend_4 $1 &c04 "Imp_4 $1
+ &h05 "Medium_Potion_5 $1 &d05 "Kite_5 $1 &s05 "Drake_5 $1 &c05 "Goblin_5 $1
+ &h06 "Large_Potion_6 $1 &d06 "Heater_6 $1 &s06 "Specter_6 $1 &c06 "Orc_6 $1
+ &h07 "Large_Potion_7 $1 &d07 "Heater_7 $1 &s07 "Ghost_7 $1 &c07 "Ogre_7 $1
+ &h08 "Super_Potion_8 $1 &d08 "Tower_Shield_8 $1 &s08 "Elemental_8 $1 &c08 "Beholder_8 $1
+ &h09 "Super_Potion_9 $1 &d09 "Tower_Shield_9 $1 &s09 "Witch_9 $1 &c09 "Medusa_9 $1
+ &h0a "Super_Potion_10 $1 &d0a "Tower_Shield_10 $1 &s0a "Familiar_10 $1 &c0a "Demon_10 $1
+ &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
+
+@deck
+ :cards/h01 :cards/h02 :cards/h03 :cards/h04 :cards/h05
+ :cards/h06 :cards/h07 :cards/h08 :cards/h09 :cards/h0a
+ :cards/h0b :cards/h0c :cards/h0d
+ :cards/d01 :cards/d02 :cards/d03 :cards/d04 :cards/d05
+ :cards/d06 :cards/d07 :cards/d08 :cards/d09 :cards/d0a
+ :cards/d0b :cards/d0c :cards/d0d
+ :cards/s01 :cards/s02 :cards/s03 :cards/s04 :cards/s05
+ :cards/s06 :cards/s07 :cards/s08 :cards/s09 :cards/s0a
+ :cards/s0b :cards/s0c :cards/s0d
+ :cards/c01 :cards/c02 :cards/c03 :cards/c04 :cards/c05
+ :cards/c06 :cards/c07 :cards/c08 :cards/c09 :cards/c0a
+ :cards/c0b :cards/c0c :cards/c0d
+ :cards/j01 :cards/j02<
\ No newline at end of file