diff --git a/Art/Block1_002.xcf b/Art/Block1_002.xcf index 5479661..bbb7687 100644 Binary files a/Art/Block1_002.xcf and b/Art/Block1_002.xcf differ diff --git a/Art/Cat_000.xcf b/Art/Cat_000.xcf index 5727f04..2654e39 100644 Binary files a/Art/Cat_000.xcf and b/Art/Cat_000.xcf differ diff --git a/Art/Cat_001.xcf b/Art/Cat_001.xcf index a7c99cb..d5e64eb 100644 Binary files a/Art/Cat_001.xcf and b/Art/Cat_001.xcf differ diff --git a/Art/Spit0_004.xcf b/Art/Spit0_004.xcf index 7ed7fab..00a9c66 100644 Binary files a/Art/Spit0_004.xcf and b/Art/Spit0_004.xcf differ diff --git a/Art/Spit1_005.xcf b/Art/Spit1_005.xcf index 0f6d974..e278553 100644 Binary files a/Art/Spit1_005.xcf and b/Art/Spit1_005.xcf differ diff --git a/Art/Spit2_006.xcf b/Art/Spit2_006.xcf index 35ee819..614d384 100644 Binary files a/Art/Spit2_006.xcf and b/Art/Spit2_006.xcf differ diff --git a/Art/block1_002.gif b/Art/block1_002.gif index cccd503..e01aebb 100644 Binary files a/Art/block1_002.gif and b/Art/block1_002.gif differ diff --git a/Art/cat_000.gif b/Art/cat_000.gif index 57e6583..3aa9289 100644 Binary files a/Art/cat_000.gif and b/Art/cat_000.gif differ diff --git a/Art/cat_001.gif b/Art/cat_001.gif index 14b512d..5077956 100644 Binary files a/Art/cat_001.gif and b/Art/cat_001.gif differ diff --git a/Art/spit0_004.gif b/Art/spit0_004.gif index 27019b2..af2a532 100644 Binary files a/Art/spit0_004.gif and b/Art/spit0_004.gif differ diff --git a/Art/spit1_005.gif b/Art/spit1_005.gif index b43e37e..3f7e696 100644 Binary files a/Art/spit1_005.gif and b/Art/spit1_005.gif differ diff --git a/Art/spit2_006.gif b/Art/spit2_006.gif index 9a6306e..aed9eea 100644 Binary files a/Art/spit2_006.gif and b/Art/spit2_006.gif differ diff --git a/Makefile b/Makefile index a6074a2..492d0d4 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ ADDR=800 PGM=gscats MRSPRITE=../MrSprite/mrsprite CHROMA=00ff00 -PALETTE=a4dffb a4dffb 008800 886611 cc9933 eebb44 dd6666 ff99aa 00ff00 ffffff b7b7b7 dddddd 0e7db1 000000 ffff00 ffff00 +PALETTE=a4dffb a4dffb 008800 886611 cc9933 eebb44 dd6666 ff99aa 00ff00 ff0000 b7b7b7 dddddd 0077bb ffff00 000000 ffffff SPRITES=SpriteBank REMOTESYMBOLS=-Wl $(shell ./ParseMapFile.py *.map) diff --git a/SpriteBank00.bin b/SpriteBank00.bin index 3ec2266..3b2ac5f 100644 Binary files a/SpriteBank00.bin and b/SpriteBank00.bin differ diff --git a/gamemanager.s b/gamemanager.s index bca8eef..fc88862 100644 --- a/gamemanager.s +++ b/gamemanager.s @@ -33,9 +33,10 @@ beginGameplay: lda #3 sta SpriteBankBank00+3 ; Tell compiled sprites what bank they are in BITS16 - + ; Erase the screen ldx #$0000 + ldy #200 jsr colorFill ; Generate, compile, and clip terrain @@ -332,7 +333,9 @@ fire: basePalette: - .word $0aef,$0aef,$0080,$0861,$0c93,$0eb4,$0d66,$0f9a,$00f0,$0fff,$0bbb,$ddd,$007b,$0000,$0ff0,$0fff + ; Color 0 and 1 must both be sky blue. Compiled rendering uses PHD (which must contain $0000), + ; and span rendering uses fill mode, so 0 can't be used there + .word $0aef,$0aef,$0080,$0861,$0c93,$0eb4,$0d66,$0f9a,$00f0,$0f00,$0bbb,$ddd,$007b,$0ff0,$0000,$0fff statusBarPalette: .word $0888,$0aef,$0F00,$0861,$0c93,$0eb4,$0d66,$0f9a,$00f0,$0fff,$0bbb,$ddd,$007b,$0000,$0ff0,$0fff diff --git a/graphics.s b/graphics.s index 7ea6482..5e0f33f 100644 --- a/graphics.s +++ b/graphics.s @@ -1,18 +1,30 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; colorFill ; Fills the screen with a color (or two). Pretty fast, but not fastest possible -; A 4:4:4:4 = Palette entries -; X = Color to fill (doubled) +; X = 4:4:4:4 = Palette entries to fill +; Y = Scanline count (fills backwards to 0) ; -; Trashes Y +; Trashes A,Y,PARAML0,PARAML1 colorFill: + + ; Calculate end of VRAM we're going to touch + sty PARAML0 + lda #160 ; Bytes per row in VRAM + sta PARAML1 + phx + jsr mult16 + clc + adc #$2000 + dec ; A now holds address of highest byte we'll touch (e.g. $9d00-1 for full screen fill) + sta PARAML0 ; Cache values for highspeed zone + sty PARAML1 + plx + FASTGRAPHICS - - lda #$9d00-1 ; Point stack to end of VRAM + lda PARAML0 tcs - - ldy #200 + ldy PARAML1 colorFillLoop: ; 80 PHXs, for 1 line diff --git a/gscats.2mg b/gscats.2mg index 9c75122..f6e5e1a 100644 Binary files a/gscats.2mg and b/gscats.2mg differ diff --git a/spritebank.s b/spritebank.s index fce6a17..d5024af 100644 --- a/spritebank.s +++ b/spritebank.s @@ -8,7 +8,7 @@ DrawSpriteBank : JMP (SpriteBankBank,X) ; Bank Number Table SpriteBankNum : - .dbyt $0200,$0100,$0500,$0000,$0300,$0600,$0400 + .dbyt $0100,$0200,$0600,$0000,$0300,$0500,$0400 SpriteBankBank : .addr SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00