M src/main.tal => src/main.tal +3 -18
@@ 27,9 27,9 @@
|0100 ( -> )
( theme )
- #730f .System/r DEO2
- #520f .System/g DEO2
- #740f .System/b DEO2
+ #07bf .System/r DEO2
+ #056f .System/g DEO2
+ #077f .System/b DEO2
( size )
#012e .Screen/width DEO2
#00f0 .Screen/height DEO2
@@ 63,7 63,6 @@
;draw-once JSR2
( let's begin! )
;file-new JSR2
- ;draw-menu-bg JSR2
;draw-menu JSR2
BRK
@@ 614,7 613,6 @@ JMP2r
@redraw-all ( -- )
- ;draw-menu-bg JSR2
;draw-once JSR2
@redraw ( -- )
@@ 630,19 628,6 @@ JMP2r
JMP2
-@draw-menu-bg ( -- )
-
- #0000 DUP2 .Screen/x DEO2 .Screen/y DEO2
- #15 .Screen/auto DEO
- .Screen/width DEI2 #03 SFT2 NIP INC #00
- &l
- ;menu-chr .Screen/addr DEO2
- #81 .Screen/sprite DEO
- INC GTHk ,&l JCN
- POP2
-
-JMP2r
-
@draw-tileview ( -- )
.settings/zoom LDZ ;draw-tileview-zoom JCN2
M src/manifest.tal => src/manifest.tal +4 -9
@@ 11,13 11,7 @@ BRK
@on-mouse-menu ( -> )
- #40 ;draw-cursor JSR2
- ( record mouse positions )
- .Mouse/x DEI2 DUP2 .cursor/x STZ2 .Screen/x DEO2
- .Mouse/y DEI2 DUP2 .cursor/y STZ2 .Screen/y DEO2
- ( draw new cursor )
- ;hand-icn .Screen/addr DEO2
- #42 .Mouse/state DEI #00 NEQ ADD .Screen/sprite DEO
+ #42 .Mouse/state DEI #00 NEQ ADD ;hand-icn ;update-cursor JSR2
( when touch cat )
.Mouse/state DEI #00 EQU ,&no-touch-cat JCN
.Mouse/y DEI2 #000c GTH2 ,&no-touch-cat JCN
@@ 231,7 225,7 @@ JMP2r
#00 ,&id STR
[ LIT2 &manifest :manifest ]
&cat
- #0b0a [ LIT &sel ff ] [ LIT &id $1 ] EQU [ JMP SWP POP ] ;draw-chr/color STA
+ ( theme ) #0b03 [ LIT &sel ff ] [ LIT &id $1 ] EQU [ JMP SWP POP ] ;draw-chr/color STA
INC2k ;draw-str JSR2 POP2 #20 ;draw-chr JSR2
;skip-sub JSR2
,&id LDR INC ,&id STR
@@ 249,7 243,8 @@ JMP2r
LDAk STH INC2 ;skip-str JSR2
STHr #00
&subcat
- STHk #030b STHr [ LIT &sel ff ] EQU [ JMP SWP POP ] [ LIT &mask $1 ] AND ;draw-chr/color STA
+ STHk
+ ( theme ) #070b STHr [ LIT &sel ff ] EQU [ JMP SWP POP ] [ LIT &mask $1 ] AND ;draw-chr/color STA
[ LIT2 &anchor $2 ] .Screen/x DEO2
#00 OVR INC #30 SFT2 #0004 ADD2 .Screen/y DEO2
SWP2 ;draw-label JSR2 SWP2