diff --git a/Makefile b/Makefile index fdc23eb..5093e9e 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ ADDR=800 PGM=gscats MRSPRITE=../MrSprite/mrsprite CHROMA=00ff00 -PALETTE=a4dffb 008800 886611 cc9933 eebb44 dd6666 ff99aa 000000 0e7db1 ffff00 ffff00 ffff00 ffff00 ffff00 ffff00 ffffff +PALETTE=a4dffb a4dffb 008800 886611 cc9933 eebb44 dd6666 ff99aa 0e7db1 000000 ffff00 ffff00 ffff00 ffff00 ffff00 ffffff SPRITES=SpriteBank REMOTESYMBOLS=-Wl $(shell ./ParseMapFile.py *.map) diff --git a/SpriteBank00.bin b/SpriteBank00.bin index f070860..6da7fb8 100644 Binary files a/SpriteBank00.bin and b/SpriteBank00.bin differ diff --git a/gamemanager.s b/gamemanager.s index ba7a0b1..61339b0 100644 --- a/gamemanager.s +++ b/gamemanager.s @@ -109,7 +109,7 @@ gameplayLoopRender: BORDER_COLOR #$1 ; Render players -; jsr renderPlayers + jsr renderPlayers gameplayLoopProjectiles: ; jsr unrenderProjectiles @@ -237,7 +237,7 @@ endGame: scrollMap: jsr unclipTerrain jsl unrenderTerrainSpans -; jsr unrenderPlayers + jsr unrenderPlayers ; jsr unrenderProjectiles sta mapScrollPos @@ -251,9 +251,9 @@ scrollMap: lda #$ffff sta mapScrollRequested -; jsr protectPlayers + jsr protectPlayers ; jsr protectProjectiles -; jsr renderPlayers + jsr renderPlayers lda #1 sta terrainDirty rts @@ -306,7 +306,7 @@ fire: basePalette: - .word $0aef,$0080,$0861,$0c93,$0eb4,$0d66,$0f9a,$0000,$007b,$0000,$0000,$0000,$0000,$0000,$0000,$0FFF + .word $0aef,$0aef,$0080,$0861,$0c93,$0eb4,$0d66,$0f9a,$007b,$0000,$0000,$0000,$0000,$0000,$0000,$0FFF diff --git a/gscats.2mg b/gscats.2mg index f3d5019..d4f23c9 100644 Binary files a/gscats.2mg and b/gscats.2mg differ diff --git a/terrain_e1.s b/terrain_e1.s index 4a51b69..2ffd832 100644 --- a/terrain_e1.s +++ b/terrain_e1.s @@ -200,7 +200,7 @@ compileTerrainSpansRow: bcs compileTerrainSpansRowInitGreen compileTerrainSpansRowInitBlack: - lda #$0020 ; First span is black + lda #$0010 ; First span is black sta (SCRATCHL) ; Initialize the row inc SCRATCHL inc SCRATCHL @@ -237,7 +237,7 @@ compileTerrainSpansRowDone: rts compileTerrainSpansRowInitGreen: - lda #$0010 ; First span is green + lda #$0020 ; First span is green sta (SCRATCHL) ; Initialize the row inc SCRATCHL inc SCRATCHL