Apple-2gs-SW/GSCats
1
0
Fork 0
mirror of https://github.com/blondie7575/GSCats.git synced 2024-06-24 09:29:29 +00:00
Code Issues Projects Releases Wiki Activity

Mixed mode rendering working and players back

Browse Source
This commit is contained in:
blondie7575 2018-03-06 18:31:54 -08:00
parent 24269638fb
commit 1c283efeed
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -16,7 +16,7 @@ ADDR=800
PGM=gscats PGM=gscats
MRSPRITE=../MrSprite/mrsprite MRSPRITE=../MrSprite/mrsprite
CHROMA=00ff00 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 SPRITES=SpriteBank
REMOTESYMBOLS=-Wl $(shell ./ParseMapFile.py *.map) REMOTESYMBOLS=-Wl $(shell ./ParseMapFile.py *.map)

BIN
SpriteBank00.bin
View File

Binary file not shown.

10
gamemanager.s
View File

@ -109,7 +109,7 @@ gameplayLoopRender:
BORDER_COLOR #$1 BORDER_COLOR #$1
; Render players ; Render players
; jsr renderPlayers jsr renderPlayers
gameplayLoopProjectiles: gameplayLoopProjectiles:
; jsr unrenderProjectiles ; jsr unrenderProjectiles
@ -237,7 +237,7 @@ endGame:
scrollMap: scrollMap:
jsr unclipTerrain jsr unclipTerrain
jsl unrenderTerrainSpans jsl unrenderTerrainSpans
; jsr unrenderPlayers jsr unrenderPlayers
; jsr unrenderProjectiles ; jsr unrenderProjectiles
sta mapScrollPos sta mapScrollPos
@ -251,9 +251,9 @@ scrollMap:
lda #$ffff lda #$ffff
sta mapScrollRequested sta mapScrollRequested
; jsr protectPlayers jsr protectPlayers
; jsr protectProjectiles ; jsr protectProjectiles
; jsr renderPlayers jsr renderPlayers
lda #1 lda #1
sta terrainDirty sta terrainDirty
rts rts
@ -306,7 +306,7 @@ fire:
basePalette: 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

BIN
gscats.2mg
View File

Binary file not shown.

4
terrain_e1.s
View File

@ -200,7 +200,7 @@ compileTerrainSpansRow:
bcs compileTerrainSpansRowInitGreen bcs compileTerrainSpansRowInitGreen
compileTerrainSpansRowInitBlack: compileTerrainSpansRowInitBlack:
lda #$0020 ; First span is black lda #$0010 ; First span is black
sta (SCRATCHL) ; Initialize the row sta (SCRATCHL) ; Initialize the row
inc SCRATCHL inc SCRATCHL
inc SCRATCHL inc SCRATCHL
@ -237,7 +237,7 @@ compileTerrainSpansRowDone:
rts rts
compileTerrainSpansRowInitGreen: compileTerrainSpansRowInitGreen:
lda #$0010 ; First span is green lda #$0020 ; First span is green
sta (SCRATCHL) ; Initialize the row sta (SCRATCHL) ; Initialize the row
inc SCRATCHL inc SCRATCHL
inc SCRATCHL inc SCRATCHL