4 files changed, 61 insertions(+), 43 deletions(-)
M README.md
M build.sh
R src/{font.tal => assets.tal}
R src/{nasu.tal => main.tal}
M README.md => README.md +2 -0
@@ 25,3 25,5 @@ uxnemu bin/nasu.rom
- [theme](https://wiki.xxiivv.com/site/theme.html)
- [snarf](https://wiki.xxiivv.com/site/snarf.html)
- [manifest](https://wiki.xxiivv.com/site/manifest.html)
+- Linted with [uxnlin](https://git.sr.ht/~rabbits/uxnlin)
+- Assembled with [drifblim](https://git.sr.ht/~rabbits/drifblim)
M build.sh => build.sh +3 -2
@@ 13,8 13,9 @@ then
fi
echo "Assembling.."
-uxnasm etc/nametable.tal bin/nametable.rom
-uxnasm src/nasu.tal bin/nasu.rom
+uxncli ~/roms/drifblim.rom etc/nametable.tal bin/nametable.rom
+cat src/main.tal src/manifest.tal src/assets.tal > bin/nasu.tal
+uxncli ~/roms/drifblim.rom bin/nasu.tal bin/nasu.rom
if [ -d "$HOME/roms" ] && [ -e ./bin/nasu.rom ]
then
R src/font.tal => src/assets.tal +52 -0
@@ 1,3 1,4 @@
+
@font ( atari8 )
0000 0000 0000 0000 6060 6060 6000 6000
6666 6600 0000 0000 006c fe6c 6cfe 6c00
@@ 47,3 48,54 @@ c060 3018 0c06 0300 3c0c 0c0c 0c0c 3c00
0000 7e0c 1830 7e00 1c30 3060 3030 1c00
1818 1818 1818 1818 380c 0c06 0c0c 3800
0000 60f2 9e0c 0000 0018 1834 3462 7e00
+
+@bigpixel-icn
+ f0f0 f0f0 0000 0000
+@halftone-icn
+ aa55 aa55 aa55 aa55
+
+@brush-icn
+ 0070 6844 2211 0906
+@select-icn
+ 0040 6070 787c 7008
+@zoom-icn
+ 0030 4884 8448 3402
+@pixel-icn
+ 7cfe fefe fefe 7c00
+@save-icn
+ 0008 2a14 6314 2a08
+@make-icn
+ 007f 4141 4142 457a
+@load-icn
+ 007f 556b 556a 557a
+@zoom-icns
+ 0030 4884 8448 3402
+ 0032 4582 8448 3402
+@slider-icns
+ f0f0 f0f0 f0f0 f000
+ 50a0 50a0 50a0 5000
+@circle-icns
+ 001c 2241 4141 221c
+ 001c 3e7f 7f7f 3e1c
+@arrow-hor-icns
+ 080c 0e7f 0e0c 0800
+ 0818 387f 3818 0800
+@arrow-ver-icns
+ 081c 3e7f 0808 0800
+ 0808 087f 3e1c 0800
+
+@frame-icns
+ ( tl ) 0000 0000 0000 0102
+ ( tc ) 0000 0000 0000 ff00
+ ( tr ) 0000 0000 0000 8040
+ ( mr ) 4040 4040 4040 4040
+ ( ml ) 0202 0202 0202 0202
+ ( bc ) 0201 0000 0000 0000
+ ( br ) 00ff 0000 0000 0000
+ ( mc ) 4080 0000 0000 0000
+
+@menu-chr
+ ffff ffff ffff ffff ffff ffff ffff ffff
+ ffff ffff ffff ff00 ffff ffff ffff ffff
+
+@spritesheet $1000 &nametable $300
R src/nasu.tal => src/main.tal +4 -41
@@ 1,4 1,4 @@
-( app/nasu : pixel editor )
+( Nasu : pixel editor )
|00 @System &vector $2 &pad $6 &r $2 &g $2 &b $2
|10 @Console &vector $2 &read $1 &pad $5 &write $1
@@ 1085,8 1085,8 @@ JMP2r
( clear )
;spritesheet #1300 ;mclr JSR2
( rename to untitled.txt )
- ;filepath #0020 ;mclr JSR2
- ;untitled-txt ;filepath #000c ;mcpy JSR2
+ ;filepath #0040 ;mclr JSR2
+ ;untitled-txt ;filepath ;scpy JSR2
#00 .state/changed STZ ;draw-state JSR2
;redraw JSR2
@@ 1364,42 1364,5 @@ JMP2r
@ror ( byte -- byte ) DUP #70 SFT SWP #01 SFT ADD JMP2r
@mcpy ( src* dst* len* -- ) SWP2 STH2 OVR2 ADD2 SWP2 &loop LDAk STH2kr STA INC2r INC2 GTH2k ,&loop JCN POP2 POP2 POP2r JMP2r
-@untitled-txt "untitled.chr $1
+@untitled-txt "untitled10x10.chr $1
@nametable-ext ".nmt $1
-
-@bigpixel-icn f0f0 f0f0 0000 0000
-@halftone-icn aa55 aa55 aa55 aa55
-
-@brush-icn 0070 6844 2211 0906
-@select-icn 0040 6070 787c 7008
-@zoom-icn 0030 4884 8448 3402
-@pixel-icn 7cfe fefe fefe 7c00
-@save-icn 0008 2a14 6314 2a08
-@make-icn 007f 4141 4142 457a
-@load-icn 007f 556b 556a 557a
-@zoom-icns 0030 4884 8448 3402 0032 4582 8448 3402
-@slider-icns f0f0 f0f0 f0f0 f000 50a0 50a0 50a0 5000
-@circle-icns 001c 2241 4141 221c 001c 3e7f 7f7f 3e1c
-@arrow-hor-icns 08 0c0e 7f0e 0c08 0008 1838 7f38 1808 00
-@arrow-ver-icns 08 1c3e 7f08 0808 0008 0808 7f3e 1c08 00
-
-@frame-icns
- ( tl ) 0000 0000 0000 0102
- ( tc ) 0000 0000 0000 ff00
- ( tr ) 0000 0000 0000 8040
- ( mr ) 4040 4040 4040 4040
- ( ml ) 0202 0202 0202 0202
- ( bc ) 0201 0000 0000 0000
- ( br ) 00ff 0000 0000 0000
- ( mc ) 4080 0000 0000 0000
-
-@menu-chr
- ffff ffff ffff ffff ffff ffff ffff ffff
- ffff ffff ffff ff00 ffff ffff ffff ffff
-
-~src/font.tal
-~src/manifest.tal
-
-|8000
-
-@spritesheet $1000 &nametable $300