diff --git a/etc/spritesheet10x10.chr b/etc/spritesheet10x10.chr new file mode 100644 index 0000000..9c00251 Binary files /dev/null and b/etc/spritesheet10x10.chr differ diff --git a/etc/spritesheet10x10.chr.nmt b/etc/spritesheet10x10.chr.nmt new file mode 100644 index 0000000..6b36526 Binary files /dev/null and b/etc/spritesheet10x10.chr.nmt differ diff --git a/src/assets.tal b/src/assets.tal index 5fdc299..f23d71e 100644 --- a/src/assets.tal +++ b/src/assets.tal @@ -34,24 +34,15 @@ 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 - @frame1-chr ( e ) 0000 0000 070f 0f0f 0000 0007 0f1f 1f1f ( h ) 0000 0000 ffff ffff 0000 00ff ffff ffff ( v ) f0f0 f0f0 f0f0 f0f0 f8f8 f8f8 f8f8 f8f8 -@menu-chr - ffff ffff ffff ffff ffff ffff ffff ffff - ffff ffff ffff ff00 ffff ffff ffff ffff +@frame2-chr + ( e ) 0000 0000 0000 0000 0000 0000 0001 0204 + ( h ) 0000 0000 0000 0000 0000 0000 00ff 0000 + ( v ) 0000 0000 0000 0000 2020 2020 2020 2020 @appicon 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0001 diff --git a/src/nasu.tal b/src/nasu.tal index 40365b3..610c8a6 100644 --- a/src/nasu.tal +++ b/src/nasu.tal @@ -806,15 +806,19 @@ JMP2r INC GTHk ,&ver JCN POP2 - .zoomview/x1 LDZ2 #0008 SUB2 .zoomview/y1 LDZ2 #0008 SUB2 #0404 ;frame-icns ;draw-frame-icn JSR2 + ( frame ) + .zoomview/x1 LDZ2 .Screen/x DEO2 + .zoomview/y1 LDZ2 .Screen/y DEO2 + #0404 ;frame2-chr ;draw-frame JSR2 ( label ) + #01 .Screen/auto DEO .zoomview/y2 LDZ2 #0008 SUB2 .Screen/y DEO2 .zoomview/x1 LDZ2 .Screen/x DEO2 ;arrow-ver-icns .Screen/addr DEO2 - #03 .Screen/sprite DEO + #02 .Screen/sprite DEO ;arrow-hor-icns .Screen/addr DEO2 - #03 .Screen/sprite DEO + #02 .Screen/sprite DEO JMP2r @@ -1026,8 +1030,14 @@ JMP2r @draw-once ( -- ) - .tileview/x1 LDZ2 #0008 SUB2 .tileview/y1 LDZ2 #0008 SUB2 #1010 ;frame-icns ;draw-frame-icn JSR2 - .nametableview/x LDZ2 #0008 SUB2 .nametableview/y LDZ2 #0008 SUB2 #1010 ;frame-icns ;draw-frame-icn JSR2 + .tileview/x1 LDZ2 .Screen/x DEO2 + .tileview/y1 LDZ2 .Screen/y DEO2 + #1010 ;frame2-chr ;draw-frame JSR2 + + .nametableview/x LDZ2 .Screen/x DEO2 + .nametableview/y LDZ2 .Screen/y DEO2 + #1010 ;frame2-chr ;draw-frame JSR2 + #01 .Screen/auto DEO JMP2r @@ -1313,43 +1323,6 @@ JMP2r JMP2r -@draw-frame-icn ( x* y* w h sprite* -- ) - - .Screen/addr DEO2 - ,&h STR ,&w STR - DUP2 .Screen/y DEO2 ,&y STR2 - DUP2 .Screen/x DEO2 ,&x STR2 - #01 .Screen/auto DEO - #05 .Screen/sprite DEO - ,&next JSR [ LIT &w $1 ] ,&repeat JSR - #02 .Screen/auto DEO - ,&next JSR #05 .Screen/sprite DEO - ,&next JSR [ LIT &h $1 ] ,&repeat JSR - ( left ) - [ LIT2 &y $2 ] #0008 ADD2 .Screen/y DEO2 - [ LIT2 &x $2 ] .Screen/x DEO2 - ,&next JSR ,&h LDR ,&repeat JSR - #01 .Screen/auto DEO - ,&next JSR #05 .Screen/sprite DEO - ,&next JSR ,&w LDR ,&repeat JSR - ,&next JSR #05 .Screen/sprite DEO - ( fill ) - ,&next JSR - ,&x LDR2 #0008 ADD2 .Screen/x DEO2 - ,&y LDR2 #0008 ADD2 .Screen/y DEO2 - -JMP2r - &next - .Screen/addr DEI2k #0008 ADD2 ROT DEO2 - JMP2r - &repeat - #00 - &repeat-loop - #05 .Screen/sprite DEO - INC GTHk ,&repeat-loop JCN - POP2 - JMP2r - @draw-frame ( w h chr* -- ) STH2 ,&h STR ,&w STR