diff --git a/gui/m291/src/assets.tal b/gui/m291/src/assets.tal index 05eba71..cf9917f 100644 --- a/gui/m291/src/assets.tal +++ b/gui/m291/src/assets.tal @@ -404,7 +404,7 @@ 0000 0000 0000 0000 0000 3333 0000 0000 0000 0000 0000 0000 0000 3030 0000 0000 ] -@mem &filepath $80 &dir $800 &folders $200 &roms $200 &misc $200 +@mem &filepath $80 &dir $800 &folders $800 &tracks $800 &misc $200 @message &buf $200 diff --git a/gui/m291/src/m291.tal b/gui/m291/src/m291.tal index 0c570ed..401dc9b 100644 --- a/gui/m291/src/m291.tal +++ b/gui/m291/src/m291.tal @@ -19,7 +19,7 @@ @misc $1 @selection $1 &mod $1 @path $2 &null $80 - @lines &folders $1 &roms $1 &misc $1 + @lines &folders $1 &tracks $1 &misc $1 @playing $1 @paused $1 @secfrom $2 @@ -253,7 +253,7 @@ ;mem/dir .File/read DEO2 ( | clean ) [ LIT2 00 -lines/folders ] STZ - [ LIT2 00 -lines/roms ] STZ + [ LIT2 00 -lines/tracks ] STZ [ LIT2 00 -lines/misc ] STZ ( | parse ) ;mem/dir @@ -276,18 +276,18 @@ #0005 ADD2 LDAk [ LIT ". ] EQU ?&hidden is-folder ?&folder is-mp3 ?&mp3 - ;mem/misc [ LIT2 00 -lines/misc ] LDZ #40 SFT2 ADD2 + ;mem/misc [ LIT2 00 -lines/misc ] LDZ ( CELLSIZE ) #60 SFT2 ADD2 .lines/misc LDZ INC .lines/misc STZ JMP2r &folder ( line* -- ) - ;mem/folders [ LIT2 00 -lines/folders ] LDZ #40 SFT2 ADD2 + ;mem/folders [ LIT2 00 -lines/folders ] LDZ ( CELLSIZE ) #60 SFT2 ADD2 .lines/folders LDZ INC .lines/folders STZ JMP2r &mp3 ( line* -- ) - ;mem/roms [ LIT2 00 -lines/roms ] LDZ #40 SFT2 ADD2 - .lines/roms LDZ INC .lines/roms STZ + ;mem/tracks [ LIT2 00 -lines/tracks ] LDZ ( CELLSIZE ) #60 SFT2 ADD2 + .lines/tracks LDZ INC .lines/tracks STZ JMP2r &hidden ( line* -- ) @@ -307,18 +307,18 @@ @ ( alt id -- ) DUP .lines/folders LDZ LTH ?&folder - .lines/folders LDZ SUB DUP .lines/roms LDZ LTH ?&roms - .lines/roms LDZ SUB DUP .lines/misc LDZ LTH ?&misc + .lines/folders LDZ SUB DUP .lines/tracks LDZ LTH ?&tracks + .lines/tracks LDZ SUB DUP .lines/misc LDZ LTH ?&misc POP JMP2r - &roms ( id -- ) - #00 SWP #40 SFT2 ;mem/roms ADD2 ! + &tracks ( id -- ) + #00 SWP ( CELLSIZE ) #60 SFT2 ;mem/tracks ADD2 ! &misc ( id -- ) - #00 SWP #40 SFT2 ;mem/misc ADD2 ! + #00 SWP ( CELLSIZE ) #60 SFT2 ;mem/misc ADD2 ! &folder ( id -- ) - #00 SWP #40 SFT2 ;mem/folders ADD2 ! + #00 SWP ( CELLSIZE ) #60 SFT2 ;mem/folders ADD2 ! @ ( file* -- ) ( | start ID3 ) @@ -357,13 +357,13 @@ [ LIT2 00 -misc ] LDZ EQU .misc STZ !fit-window @count-lines ( -- lines ) - .lines/folders LDZ .lines/roms LDZ ADD + .lines/folders LDZ .lines/tracks LDZ ADD ( ) [ LIT2 00 -misc ] LDZ EQU ?{ .lines/misc LDZ ADD } JMP2r @has-spacer ( -- f ) [ LIT2 00 -lines/folders ] LDZ NEQ - ( ) [ LIT2 00 -lines/roms ] LDZ NEQ + ( ) [ LIT2 00 -lines/tracks ] LDZ NEQ ( ) [ LIT2 00 -misc ] LDZ EQU ?{ [ LIT2 00 -lines/misc ] LDZ NEQ ORA } AND JMP2r @@ -434,7 +434,7 @@ ( | folders ) ;mem/folders .lines/folders LDZ #01 .selection LDZ [ LIT2 00 -lines/folders ] LDZ EQU ?{ ;dash-icn } - ;mem/roms .lines/roms LDZ #00 .selection LDZ .lines/folders LDZ SUB + ;mem/tracks .lines/tracks LDZ #00 .selection LDZ .lines/folders LDZ SUB [ LIT2 00 -misc ] LDZ EQU ?{ ;mem/misc .lines/misc LDZ #00 .selection LDZ ! } JMP2r @@ -605,7 +605,7 @@ .Screen/y DEO2 } ( | normal ) #0008 .Screen/x DEO2 - #00 OVR #40 SFT2 [ LIT2 &t $2 ] ADD2 STHr + #00 OVR ( CELLSIZE ) #60 SFT2 [ LIT2 &t $2 ] ADD2 STHr .Screen/y DEI2k #0010 ADD2 ROT DEO2 INC GTHk ?&>l POP2 JMP2r