better color routine, still needs improving

This commit is contained in:
Dagen Brock 2015-11-28 14:23:23 -06:00
parent acbc77e1bf
commit 10ac88614c
2 changed files with 14 additions and 90 deletions

View File

@ -1,60 +0,0 @@
#!/bin/bash
# Here's our fancy build pipeline. Output = src/mtsystem (binary file)
./Merlin32 . src/mt.s
# name of your disk image
DISK="MT"
# set one of the following to true
USE_CADIUS=true
USE_APPLECOMMANDER=false
SRCFILES=(`ls src/*.s`)
SYSFILES=(`ls src/*system`)
CADIUS="../tools/Cadius"
P8NAME="$DISK"
IMGNAME="$DISK.po"
DISKSIZE=800KB
SRCDIR=src
BLDDIR=build/nix
if [ ! -d $BLDDIR ] ; then
echo "Build directory for this platform doesn't exist so I will create it."
mkdir -p $BLDDIR
echo "Created: $BLDDIR"
sleep 1
fi
# need to autogen
cp src/_FileInformation.txt $BLDDIR
$CADIUS createvolume $IMGNAME $P8NAME $DISKSIZE
#SOURCE FILES
for f in ${SRCFILES[@]};
do
FNAME=${f##*/}
echo Processing $FNAME
cp $f $BLDDIR/$FNAME
$CADIUS sethighbit $BLDDIR/$FNAME
$CADIUS addfile $IMGNAME /$P8NAME/ $BLDDIR/$FNAME -V
done
#SYSTEM FILES
for f in ${SYSFILES[@]};
do
FNAME=${f##*/}
echo Processing $FNAME
cp $f $BLDDIR/$FNAME
#$CADIUS sethighbit $BLDDIR/$FNAME
$CADIUS addfile $IMGNAME /$P8NAME/ $BLDDIR/$FNAME -V
done
exit

View File

@ -61,62 +61,46 @@ MiniWait nop
mx %11 mx %11
ColorizeMenu ColorizeMenu
lda #6 lda #6
ldx #$A0 ; green
jsr WaitScanline jsr WaitScanline
lda #$A0 ; green
sta $c022
jsr MiniWait
lda #7 lda #7
ldx #$c0 ; green
jsr WaitScanline jsr WaitScanline
lda #$c0 ; green
sta $c022
jsr MiniWait
lda #9 lda #9
ldx #$d0 ; yello
jsr WaitScanline jsr WaitScanline
lda #$d0 ; yello
sta $c022
jsr MiniWait
lda #10 lda #10
ldx #$90 ; orange
jsr WaitScanline jsr WaitScanline
lda #$90 ; orange
sta $c022
jsr MiniWait
lda #11 lda #11
ldx #$10 ; red
jsr WaitScanline jsr WaitScanline
lda #$10 ; red
sta $c022
jsr MiniWait
lda #12 lda #12
ldx #$30 ; purple
jsr WaitScanline jsr WaitScanline
lda #$30 ; purple
sta $c022
jsr MiniWait
lda #13 lda #13
ldx #$70 ; bblue
jsr WaitScanline jsr WaitScanline
lda #$70 ; bblue
sta $c022
jsr MiniWait
lda #15 lda #15
ldx #$50 ; grey
jsr WaitScanline jsr WaitScanline
lda #$50 ; grey
sta $c022
jsr MiniWait
lda #16 lda #16
ldx #$f0 ; white
jsr WaitScanline jsr WaitScanline
lda #$f0 ; white
sta $c022
rts rts
* now stores x immediately
WaitScanline jmp WaitSCB WaitScanline ;jmp WaitSCB
sta :val+1 sta :val+1
:waitloop lda $c02f :waitloop lda $c02f
@ -125,6 +109,7 @@ WaitScanline jmp WaitSCB
rol rol
:val cmp #$00 :val cmp #$00
bne :waitloop bne :waitloop
stx $c022
rts rts
ColorizeMenuOld ColorizeMenuOld
@ -681,4 +666,3 @@ LoLineTableL db <Lo01,<Lo02,<Lo03,<Lo04,<Lo05,<Lo06
db <Lo07,<Lo08,<Lo09,<Lo10,<Lo11,<Lo12 db <Lo07,<Lo08,<Lo09,<Lo10,<Lo11,<Lo12
db <Lo13,<Lo14,<Lo15,<Lo16,<Lo17,<Lo18 db <Lo13,<Lo14,<Lo15,<Lo16,<Lo17,<Lo18
db <Lo19,<Lo20,<Lo21,<Lo22,<Lo23,<Lo24 db <Lo19,<Lo20,<Lo21,<Lo22,<Lo23,<Lo24