Mixed mode rendering working and players back

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)
 

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
 
 
 

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