d6
/
uxn-utils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(m291) Skip utf8 outside of spritesheet

This commit is contained in:
Devine Lu Linvega 2024-08-26 16:20:13 -07:00
parent df47bec2ed
commit 0ab6dc88e4
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/m291/src/assets.tal
View File

@ -55,6 +55,8 @@
@line-icn [ 0000 00ff 0000 0000 ] @line-icn [ 0000 00ff 0000 0000 ]
@check-icn [ aa55 aa55 aa55 aa55 aa55 aa55 aa55 aa55 ]
@font [ @font [
0406 070a 070b 0a03 0505 0707 0407 0407 0406 070a 070b 0a03 0505 0707 0407 0407
0808 0808 0808 0808 0808 0404 0608 0608 0808 0808 0808 0808 0808 0404 0608 0608

27
gui/m291/src/m291.tal
View File

@ -270,19 +270,19 @@
is-folder ?&folder is-folder ?&folder
is-mp3 ?&mp3 is-mp3 ?&mp3
;mem/misc [ LIT2 00 -lines/misc ] LDZ ;mem/misc [ LIT2 00 -lines/misc ] LDZ
( CELLSIZE ) #60 SFT2 ADD2 <lcpy> ( CELLSIZE ) #70 SFT2 ADD2 <lcpy>
.lines/misc LDZ INC .lines/misc STZ .lines/misc LDZ INC .lines/misc STZ
JMP2r JMP2r
&folder ( line* -- ) &folder ( line* -- )
;mem/folders [ LIT2 00 -lines/folders ] LDZ ;mem/folders [ LIT2 00 -lines/folders ] LDZ
( CELLSIZE ) #60 SFT2 ADD2 <lcpy> ( CELLSIZE ) #70 SFT2 ADD2 <lcpy>
.lines/folders LDZ INC .lines/folders STZ .lines/folders LDZ INC .lines/folders STZ
JMP2r JMP2r
&mp3 ( line* -- ) &mp3 ( line* -- )
;mem/tracks [ LIT2 00 -lines/tracks ] LDZ ;mem/tracks [ LIT2 00 -lines/tracks ] LDZ
( CELLSIZE ) #60 SFT2 ADD2 <lcpy> ( CELLSIZE ) #70 SFT2 ADD2 <lcpy>
.lines/tracks LDZ INC .lines/tracks STZ .lines/tracks LDZ INC .lines/tracks STZ
JMP2r JMP2r
@ -310,15 +310,15 @@
&tracks ( id -- ) &tracks ( id -- )
DUP .selection/track STZ DUP .selection/track STZ
#00 SWP #00 SWP
( CELLSIZE ) #60 SFT2 ;mem/tracks ADD2 !<send-load> ( CELLSIZE ) #70 SFT2 ;mem/tracks ADD2 !<send-load>
&misc ( id -- ) &misc ( id -- )
#00 SWP #00 SWP
( CELLSIZE ) #60 SFT2 ;mem/misc ADD2 !<send-load> ( CELLSIZE ) #70 SFT2 ;mem/misc ADD2 !<send-load>
&folder ( id -- ) &folder ( id -- )
#00 SWP #00 SWP
( CELLSIZE ) #60 SFT2 ;mem/folders ADD2 !<enter> ( CELLSIZE ) #70 SFT2 ;mem/folders ADD2 !<enter>
@<send-load> ( file* -- ) @<send-load> ( file* -- )
( | start ID3 ) ( | start ID3 )
@ -644,7 +644,7 @@
( | normal ) ( | normal )
#0008 .Screen/x DEO2 #0008 .Screen/x DEO2
#00 OVR #00 OVR
( CELLSIZE ) #60 SFT2 [ LIT2 &t $2 ] ADD2 STHr <draw-uf2> ( CELLSIZE ) #70 SFT2 [ LIT2 &t $2 ] ADD2 STHr <draw-uf2>
.Screen/y DEI2k #0010 ADD2 ROT DEO2 .Screen/y DEI2k #0010 ADD2 ROT DEO2
INC GTHk ?&>l INC GTHk ?&>l
POP2 JMP2r POP2 JMP2r
@ -671,11 +671,20 @@
,<draw-glyph>/color STR ,<draw-glyph>/color STR
[ LIT2 15 -Screen/auto ] DEO [ LIT2 15 -Screen/auto ] DEO
&>w ( -- ) &>w ( -- )
LDAk #1f GTH ?{ POP2 JMP2r }
LDAk <draw-glyph> LDAk <draw-glyph>
INC2 !&>w next-glyph LDAk ?&>w
POP2 JMP2r
@next-glyph ( addr* -- addr* )
INC2 LDAk
( utf8 ) #06 SFT #02 EQU ?next-glyph
JMP2r
@<draw-glyph> ( char -- ) @<draw-glyph> ( char -- )
DUP #7f LTH ?{
POP ;check-icn .Screen/addr DEO2
,&color LDR .Screen/sprite DEO
JMP2r }
#20 SUB #00 SWP #20 SUB #00 SWP
( ) DUP2 #50 SFT2 ;font/glyphs ADD2 .Screen/addr DEO2 ( ) DUP2 #50 SFT2 ;font/glyphs ADD2 .Screen/addr DEO2
( ) ;font ADD2 LDA #00 SWP .Screen/x DEI2 ADD2 ( ) ;font ADD2 LDA #00 SWP .Screen/x DEI2 ADD2