diff --git a/grafproc.asm b/grafproc.asm index f885e05..a084c0e 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -1894,7 +1894,7 @@ EndPutChar rts .endp -; ------------------------------------------ +;-------------------------------------------------- .proc PutChar4x4 ; puts 4x4 pixels char on the graphics screen ; in: dx, dy (LOWER left corner of the char) @@ -1903,7 +1903,6 @@ EndPutChar ; all pixels are being drawn ; (empty and not empty) ;-------------------------------------------------- -; rts cpw dy #(screenheight-1) jcs TypeChar.EndPutChar ;nearest RTS cpw dy #(4) diff --git a/scorch.asm b/scorch.asm index 4b29d37..c7effa3 100644 --- a/scorch.asm +++ b/scorch.asm @@ -6,12 +6,12 @@ ;Miami & Warsaw 2022 ;--------------------------------------------------- -.def TARGET = 800; 5200 ; or 800 +.def TARGET = 800 ;5200 ; or 800 ;atari800 -5200 -cart ${outputFilePath} -cart-type 4 ;atari800 -run ${outputFilePath} ;--------------------------------------------------- - OPT r+ ; saves 12 bytes :O + ;OPT r+ ; saves 12 bytes :O ;--------------------------------------------------- .macro build diff --git a/scorch.bin b/scorch.bin index dd2947d..8315229 100644 Binary files a/scorch.bin and b/scorch.bin differ diff --git a/scorch.xex b/scorch.xex index 149cfb5..ef3336f 100644 Binary files a/scorch.xex and b/scorch.xex differ diff --git a/textproc.asm b/textproc.asm index 0b5d017..6a06c05 100644 --- a/textproc.asm +++ b/textproc.asm @@ -1798,13 +1798,9 @@ EndOfTypeLine4x4 jsr TL4x4_top adb ResultY #4 ;next line - ;seppuku + ;sure? mwa #areYouSureText LineAddress4x4 - mwa #((ScreenWidth/2)-(8*4)) LineXdraw ; centering - mva ResultY LineYdraw - jsr TypeLine4x4 - adb ResultY #4 ;next line - + jsr _sep_opty ;bottom frame mva ResultY LineYdraw jsr TL4x4_bottom @@ -1825,17 +1821,22 @@ skip01 @ mva #$ff plot4x4color mwa #lineClear LineAddress4x4 - mwa #((ScreenWidth/2)-(8*4)) LineXdraw ; centering - mva ResultY LineYdraw - jsr TypeLine4x4 - adb ResultY #4 ;next line - + jsr _sep_opty dec di bne @- quit_areyousure rts .endp + +.proc _sep_opty + mwa #((ScreenWidth/2)-(8*4)) LineXdraw ; centering + mva ResultY LineYdraw + jsr TypeLine4x4 + adb ResultY #4 ;next line + rts +.endp + ;-------------------------------- .proc DisplaySeppuku ;using 4x4 font @@ -1856,11 +1857,8 @@ seppuku_loop ;seppuku mwa #seppukuText LineAddress4x4 - mwa #((ScreenWidth/2)-(8*4)) LineXdraw ; centering - mva ResultY LineYdraw - jsr TypeLine4x4 - adb ResultY #4 ;next line - + jsr _sep_opty + ;bottom frame mva ResultY LineYdraw jsr TL4x4_bottom ; just go @@ -1868,22 +1866,22 @@ seppuku_loop ;clean seppuku mva #3 di - mva #4 ResultY -@ + ;mva #4 ResultY + lda #4 + sta ResultY +loplop ;@ mwa #lineClear LineAddress4x4 - mwa #((ScreenWidth/2)-(8*4)) LineXdraw ; centering - mva ResultY LineYdraw - jsr TypeLine4x4 - adb ResultY #4 ;next line + jsr _sep_opty dec di - bne @- + bne loplop ;@- dec fs jne seppuku_loop quit_seppuku rts + .endp ;-------------------------------- .proc DisplayResults ;