diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 7f98a60e..2b5b6ec5 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/A2osX.S.txt b/A2osX.S.txt index 00fd86cd..55ae46d2 100644 --- a/A2osX.S.txt +++ b/A2osX.S.txt @@ -17,8 +17,8 @@ NEW TmpPtr1 .EQ $0 main & aux ZP TmpPtr2 .EQ $2 main & aux ZP *-------------------------------------- -A2osX.LOGOLOAD .EQ $2000 A2osX.KMLOAD .EQ $2000 +A2osX.LOGOLOAD .EQ $4000 A2osX.KMMAXLEN .EQ $6000 A2osX.OpenBuff1 .EQ $8000 1024 Buffer for MLIOPEN01 A2osX.OpenBuff2 .EQ $8400 1024 Buffer for MLIOPEN02 @@ -151,7 +151,7 @@ A2osX.EnumKM >LDYAI MSG.KMENUM *-------------------------------------- A2osX.MLIQuit >LDYAI MSG.INIT0OK jsr PrintFYA - >DEBUG + >DEBUGOA jsr MLI .DA #MLIQUIT @@ -270,7 +270,7 @@ A2osX.ScreenDLGR lda TmpPtr1 clc - adc #80 + adc #40 sta TmpPtr1 bcc .3 inc TmpPtr1+1 @@ -300,20 +300,11 @@ A2osX.ScreenDLGR iny cpy #40 - bne .2 + bne .4 lda TmpPtr1 clc - adc #80 - sta TmpPtr1 - bcc .3 - inc TmpPtr1+1 - - - - lda TmpPtr1 - clc - adc #80 + adc #40 sta TmpPtr1 bcc .7 inc TmpPtr1+1 diff --git a/BIN/BMP2PIX.S.txt b/BIN/BMP2PIX.S.txt index 8ce231e7..9e67d561 100644 --- a/BIN/BMP2PIX.S.txt +++ b/BIN/BMP2PIX.S.txt @@ -113,13 +113,13 @@ CS.RUN .4 >LDA.G hInputFile bne .5 - jsr CS.RUN.OPENINPUT + jsr CS.RUN.OpenInput bcc .1 scan for any other args rts .5 >LDA.G hOutputFile bne .99 - jsr CS.RUN.CREATEOUTPUT + jsr CS.RUN.CreateOutput bcc .1 scan for any other args .9 rts @@ -296,6 +296,9 @@ CS.RUN.24 lda #S.BM.F.BBP4 .2 sta ZPOutputRowBytes stx ZPOutputRowBytes+1 + >STA.G PIX.Header+S.BM.RowBytes +* txa +* >STA.G PIX.Header+S.BM.RowBytes+1 jsr CS.RUN.GetOutputBuf bcs CS.RUN.RTS @@ -315,7 +318,7 @@ CS.RUN.24.LOOP inc ZPLineCount lda #$ff sta ZPCntX - jsr CS.RUN.READINPUT + jsr CS.RUN.ReadInput bcs .9 lda ZPOutputBuf @@ -359,7 +362,7 @@ CS.RUN.24.LOOP inc ZPLineCount tay pla - bcc .6 + bcs .6 sta (ZPOutputBuf),y bra .2 @@ -371,7 +374,7 @@ CS.RUN.24.LOOP inc ZPLineCount sta (ZPOutputBuf),y bra .2 -.8 jsr CS.RUN.WRITE +.8 jsr CS.RUN.WriteOutput bcs .9 lda #0 @@ -467,7 +470,7 @@ CS.RUN.GetNearestColor CS.RUN.GetIndexInPalette.RTS rts *-------------------------------------- -CS.RUN.OPENINPUT +CS.RUN.OpenInput >PUSHWI 0 Aux type >PUSHBI 0 Type >PUSHBI O.RDONLY @@ -539,7 +542,7 @@ CS.RUN.OPENINPUT sec rts *-------------------------------------- -CS.RUN.READINPUT +CS.RUN.ReadInput >PUSHW ZPInputRowBytes >PUSHW ZPInputBuf >LDA.G hInputFile @@ -557,7 +560,7 @@ CS.RUN.READINPUT sta ZPPixelCount+1 .9 rts *-------------------------------------- -CS.RUN.CREATEOUTPUT +CS.RUN.CreateOutput >PUSHWI 0 Aux type >PUSHBI $CB PIX Type >PUSHBI O.WRONLY+O.CREATE @@ -589,13 +592,14 @@ CS.RUN.GetOutputBuf sta ZPPtr1+1 bra .1 -.8 >LDYA.G ZPPtr1 +.8 >LDYA ZPPtr1 >SYSCALL Getmem bcs .9 + >STYA ZPOutputBuf txa >STA.G hOutputBuf - + lda ZPPtr1 >STA.G OutputDataLen clc @@ -610,7 +614,8 @@ CS.RUN.GetOutputBuf clc .9 rts *-------------------------------------- -CS.RUN.WRITE >PUSHWI S.BM +CS.RUN.WriteOutput + >PUSHWI S.BM >PUSHEA.G PIX.Header >LDA.G hOutputFile >SYSCALL FWrite @@ -621,9 +626,6 @@ CS.RUN.WRITE >PUSHWI S.BM >LDA.G hOutputFile >SYSCALL FWrite -.9 rts -*-------------------------------------- -CS.RUN.WRITE.BUF .9 rts *-------------------------------------- CS.DOEVENT sec diff --git a/_Pics/A2osX.logo.bmp b/_Pics/A2osX.logo.bmp index 8efbd9de..767d1199 100644 Binary files a/_Pics/A2osX.logo.bmp and b/_Pics/A2osX.logo.bmp differ