M build.sh => build.sh +1 -1
@@ 32,4 32,4 @@ cp ako10x10.chr bin/
echo "Running.."
uxncli bin/nametable.rom bin/ako10x10.chr
-uxn11 ~/roms/nasu.rom bin/ako10x10.chr
+uxnemu bin/nasu.rom bin/ako10x10.chr
M src/nametable.tal => src/nametable.tal +1 -6
@@ 29,19 29,15 @@ BRK
STH2r ;sput JSR2 BRK
&end
POP
-
( prep destination )
;src ;dst ;scpy JSR2
;&nmt-ext ;dst ;scat JSR2
;dst .File2/name DEO2
-
- STH2r ;parse-chr JSR2
-
+ STH2r ,parse-chr JSR
( export compressed spritesheet )
;src .File2/name DEO2
.length LDZ2 .File2/length DEO2
;spritesheet .File2/write DEO2
-
( halt )
#010f DEO
@@ 52,7 48,6 @@ BRK
.File1/name DEO2
#0010 .File1/length DEO2
-
&stream
;buf .File1/read DEO2
( save addr )
M src/nasu.tal => src/nasu.tal +8 -11
@@ 974,23 974,19 @@ JMP2r
.toolview/y1 LDZ2 .Screen/y DEO2
( colors )
- .toolview/x1 LDZ2 STH2k .Screen/x DEO2
- ;circle-icns [ #00 .settings/color LDZ #01 EQU #30 SFT2 ] ADD2 .Screen/addr DEO2
+ .toolview/x1 LDZ2 .Screen/x DEO2
+ ;circle-icns #00 .settings/color LDZ #01 EQU #30 SFT2 ADD2 .Screen/addr DEO2
#01 .Screen/sprite DEO
- STH2kr #0008 ADD2 .Screen/x DEO2
- ;circle-icns [ #00 .settings/color LDZ #02 EQU #30 SFT2 ] ADD2 .Screen/addr DEO2
+ ;circle-icns #00 .settings/color LDZ #02 EQU #30 SFT2 ADD2 .Screen/addr DEO2
#02 .Screen/sprite DEO
- STH2kr #0010 ADD2 .Screen/x DEO2
- ;circle-icns [ #00 .settings/color LDZ #03 EQU #30 SFT2 ] ADD2 .Screen/addr DEO2
+ ;circle-icns #00 .settings/color LDZ #03 EQU #30 SFT2 ADD2 .Screen/addr DEO2
#03 .Screen/sprite DEO
( tools )
- STH2kr #0020 ADD2 .Screen/x DEO2
+ .Screen/x DEI2k #0008 ADD2 ROT DEO2
;brush-icn .Screen/addr DEO2
#01 [ .settings/tool LDZ #00 EQU ] ADD .Screen/sprite DEO
- STH2kr #0029 ADD2 .Screen/x DEO2
;select-icn .Screen/addr DEO2
#01 [ .settings/tool LDZ #01 EQU ] ADD .Screen/sprite DEO
- STH2r #0030 ADD2 .Screen/x DEO2
;zoom-icns [ #00 .settings/zoom LDZ #30 SFT2 ADD2 ] .Screen/addr DEO2
#01 [ .settings/tool LDZ #02 EQU ] ADD .Screen/sprite DEO
( file i/o )
@@ 1366,8 1362,9 @@ JMP2r
@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 0008 0c0e 7f0e 0c08 0008 1838 7f38 1808
-@arrow-ver-icns 0008 1c3e 7f08 0808 0008 0808 7f3e 1c08
+
+@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