From 2d58dc08620b9db46fedb6866a439fe46c3ba99a Mon Sep 17 00:00:00 2001 From: blondie7575 Date: Fri, 22 Feb 2019 19:00:48 -0500 Subject: [PATCH] Fixed projectiles in high VRAM not rendering --- gamemanager.s | 11 ++++------- gameobject.s | 4 ++-- gscats.2mg | Bin 819264 -> 819264 bytes player.s | 8 ++++---- projectile.s | 2 +- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/gamemanager.s b/gamemanager.s index a199e30..30f9cc8 100644 --- a/gamemanager.s +++ b/gamemanager.s @@ -243,15 +243,12 @@ trackActiveShotDone: ; Handles changing the active player ; endTurn: - lda #0 ; HAAAAX + lda currentPlayer + inc + cmp #NUMPLAYERS + beq endTurnWrap sta currentPlayer -; lda currentPlayer -; inc -; cmp #NUMPLAYERS -; beq endTurnWrap -; sta currentPlayer - endTurnRefresh: jsr processTurnForProjectiles diff --git a/gameobject.s b/gameobject.s index 65e3b02..253923e 100644 --- a/gameobject.s +++ b/gameobject.s @@ -437,8 +437,8 @@ unrenderGameObject: ; Find gameobject location in video memory jsr vramPtr - cpx #0 - bmi unrenderGameobjectSkip + cpx #$ffff + beq unrenderGameobjectSkip bra unrenderGameobjectBackground unrenderGameobjectSkip: diff --git a/gscats.2mg b/gscats.2mg index e0960e9112270184692d4def1f1051f2851b29ef..3a0f3494c8107d66dc347de6da274cb9ef8cd77d 100644 GIT binary patch delta 2163 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 GM*ag>QeFlC diff --git a/player.s b/player.s index 92be593..7a9d4e9 100644 --- a/player.s +++ b/player.s @@ -278,8 +278,8 @@ protectPlayers: lda #playerData sta PARAML0 jsr vramPtr - cpx #0 - bmi protectPlayerNext + cpx #$ffff + beq protectPlayerNext lda #playerData+GO_BACKGROUND sta PARAML0 @@ -289,8 +289,8 @@ protectPlayerNext: lda #playerData+PD_SIZE sta PARAML0 jsr vramPtr - cpx #0 - bmi protectPlayerDone + cpx #$ffff + beq protectPlayerDone lda #playerData+GO_BACKGROUND+PD_SIZE sta PARAML0 diff --git a/projectile.s b/projectile.s index 9dd8dee..447b747 100644 --- a/projectile.s +++ b/projectile.s @@ -670,7 +670,7 @@ protectProjectilesGotOne: sta PARAML0 phx jsr vramPtr - cpx #-1 + cpx #$ffff beq protectProjectilesOffscreen lda #projectileData+GO_BACKGROUND