mirror-uxn
/
nasu
mirror of https://git.sr.ht/~rabbits/nasu
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merged literals

main
Devine Lu Linvega 2 years ago
parent
0d8f473f64
commit
6a3e70e361
1 changed files with 16 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      src/nasu.tal

31
src/nasu.tal
Unescape View File

@ -611,7 +611,7 @@
[ LIT2 f6 -Screen/auto ] DEO [ LIT2 f6 -Screen/auto ] DEO
#1000 #1000
&>loop ( -- ) &>loop ( -- )
#81 .Screen/sprite DEO [ LIT2 81 -Screen/sprite ] DEO
INC GTHk ?&>loop INC GTHk ?&>loop
POP2 POP2
( | draw selection ) ( | draw selection )
@ -622,7 +622,7 @@
.selection/y2 LDZ .selection/y1 LDZ SUB INC #00 .selection/y2 LDZ .selection/y1 LDZ SUB INC #00
&>loop-sel ( -- ) &>loop-sel ( -- )
#00 OVR #80 SFT2 [ LIT2 &sprite $2 ] ADD2 .Screen/addr DEO2 #00 OVR #80 SFT2 [ LIT2 &sprite $2 ] ADD2 .Screen/addr DEO2
#84 .Screen/sprite DEO [ LIT2 84 -Screen/sprite ] DEO
INC GTHk ?&>loop-sel INC GTHk ?&>loop-sel
POP2 [ LIT2 01 -Screen/auto ] DEO POP2 [ LIT2 01 -Screen/auto ] DEO
( | draw selection size ) ( | draw selection size )
@ -713,9 +713,9 @@
.zoomview/y2 LDZ2 #0008 SUB2 .Screen/y DEO2 .zoomview/y2 LDZ2 #0008 SUB2 .Screen/y DEO2
.zoomview/x1 LDZ2 .Screen/x DEO2 .zoomview/x1 LDZ2 .Screen/x DEO2
;arrow-ver-icns .Screen/addr DEO2 ;arrow-ver-icns .Screen/addr DEO2
#02 .Screen/sprite DEO [ LIT2 02 -Screen/sprite ] DEO
;arrow-hor-icns .Screen/addr DEO2 ;arrow-hor-icns .Screen/addr DEO2
#02 .Screen/sprite DEO [ LIT2 02 -Screen/sprite ] DEO
JMP2r JMP2r
@<draw-preview> ( -- ) @<draw-preview> ( -- )
@ -740,7 +740,7 @@
#00 SWP #00 SWP
ADD2 ] ADD2 STH2 !&resume ADD2 ] ADD2 STH2 !&resume
&outside ;halftone-icn .Screen/addr DEO2 &outside ;halftone-icn .Screen/addr DEO2
#03 .Screen/sprite DEO &resume INC GTHk ?&>hor [ LIT2 03 -Screen/sprite ] DEO &resume INC GTHk ?&>hor
POP2 INC GTHk ?&>ver POP2 INC GTHk ?&>ver
POP2 POP2r POP2 POP2r
( | label ) ( | label )
@ -767,7 +767,7 @@
#1000 #1000
&>loop ( -- ) &>loop ( -- )
DUP STHkr GTH #30 SFT #00 SWP ;slider-icns ADD2 .Screen/addr DEO2 DUP STHkr GTH #30 SFT #00 SWP ;slider-icns ADD2 .Screen/addr DEO2
#02 .Screen/sprite DEO [ LIT2 02 -Screen/sprite ] DEO
.Screen/x DEI2k INC2 INC2 ROT DEO2 .Screen/x DEI2k INC2 INC2 ROT DEO2
INC GTHk ?&>loop INC GTHk ?&>loop
POP2 POPr JMP2r POP2 POPr JMP2r
@ -780,7 +780,7 @@
#00 OVR #03 AND #30 SFT2 .blendview/x1 LDZ2 ADD2 .Screen/x DEO2 #00 OVR #03 AND #30 SFT2 .blendview/x1 LDZ2 ADD2 .Screen/x DEO2
#00 OVR #32 SFT2 .blendview/y1 LDZ2 ADD2 .Screen/y DEO2 #00 OVR #32 SFT2 .blendview/y1 LDZ2 ADD2 .Screen/y DEO2
;fill-icn .Screen/addr DEO2 ;fill-icn .Screen/addr DEO2
#00 .Screen/sprite DEO [ LIT2 00 -Screen/sprite ] DEO
.settings/focus LDZ2 .Screen/addr DEO2 .settings/focus LDZ2 .Screen/addr DEO2
DUP .settings/blend LDZ #b0 AND ADD .Screen/sprite DEO DUP .settings/blend LDZ #b0 AND ADD .Screen/sprite DEO
INC GTHk ?&>loop INC GTHk ?&>loop
@ -828,11 +828,11 @@
( | colors ) ( | colors )
.toolview/x1 LDZ2 .Screen/x DEO2 .toolview/x1 LDZ2 .Screen/x DEO2
;circle-icns #00 .settings/color LDZ #01 EQU #30 SFT2 ADD2 .Screen/addr DEO2 ;circle-icns #00 .settings/color LDZ #01 EQU #30 SFT2 ADD2 .Screen/addr DEO2
#01 .Screen/sprite DEO [ LIT2 01 -Screen/sprite ] DEO
;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 [ LIT2 02 -Screen/sprite ] DEO
;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 [ LIT2 03 -Screen/sprite ] DEO
( | tools ) ( | tools )
.Screen/x DEI2k #0008 ADD2 ROT DEO2 .Screen/x DEI2k #0008 ADD2 ROT DEO2
;brush-icn .Screen/addr DEO2 ;brush-icn .Screen/addr DEO2
@ -845,10 +845,10 @@
<draw-state> <draw-state>
.toolview/x2 LDZ2 STH2k #0018 SUB2 .Screen/x DEO2 .toolview/x2 LDZ2 STH2k #0018 SUB2 .Screen/x DEO2
;load-icn .Screen/addr DEO2 ;load-icn .Screen/addr DEO2
#01 .Screen/sprite DEO [ LIT2 01 -Screen/sprite ] DEO
STH2r #0020 SUB2 .Screen/x DEO2 STH2r #0020 SUB2 .Screen/x DEO2
;make-icn .Screen/addr DEO2 ;make-icn .Screen/addr DEO2
#01 .Screen/sprite DEO [ LIT2 01 -Screen/sprite ] DEO
( | filepath ) ( | filepath )
#01 !<draw-filepath> #01 !<draw-filepath>
@ -867,14 +867,15 @@
;<draw-chr>/color STA ;<draw-chr>/color STA
;filepath ;filepath
( | scroll ) ( | scroll )
DUP2 slen #0013 GTH2 #00 SWP ;filepath slen #0013 SUB2 MUL2 ADD2 <draw-str> POP2 JMP2r DUP2 slen #0013 GTH2 #00 SWP ;filepath slen #0013 SUB2 MUL2 ADD2 <draw-str>
POP2 JMP2r
@<clear-filepath> ( color -- ) @<clear-filepath> ( color -- )
POP ;fill-icn .Screen/addr DEO2 POP ;fill-icn .Screen/addr DEO2
[ LIT2 01 -Screen/auto ] DEO [ LIT2 01 -Screen/auto ] DEO
#1300 #1300
&>l ( -- ) &>l ( -- )
#00 .Screen/sprite DEO [ LIT2 00 -Screen/sprite ] DEO
INC GTHk ?&>l INC GTHk ?&>l
POP2 JMP2r POP2 JMP2r
@ -922,7 +923,7 @@
@<draw-chr> ( char -- ) @<draw-chr> ( char -- )
#20 SUB #00 SWP #30 SFT2 ;font ADD2 .Screen/addr DEO2 #20 SUB #00 SWP #30 SFT2 ;font ADD2 .Screen/addr DEO2
[ LIT &color 03 ] .Screen/sprite DEO [ LIT2 &color 03 -Screen/sprite ] DEO
JMP2r JMP2r
@<draw-frame> ( w h chr* -- ) @<draw-frame> ( w h chr* -- )

Write Preview
Loading…
Cancel
Save