Fixed player freeze above row 5

This commit is contained in:
Rob McMullen 2017-07-22 08:22:15 -07:00
parent c3fa960fc3
commit 62976be9e8
3 changed files with 39 additions and 23 deletions

54
debug.s
View File

@ -104,34 +104,50 @@ debug_player nop
dec scratch_row
ldx #34
ldy scratch_row
lda #'t'
lda #'s'
jsr fastfont
ldx #0
lda tdamageindex1
lda actor_status,x
ldx #35
ldy scratch_row
jsr debughex
ldx #0
lda tdamageindex2
lda actor_row,x
ldx #38
ldy scratch_row
jsr debughex
;jsr debughex
dec scratch_row
ldx #34
ldy scratch_row
lda #'p'
jsr fastfont
ldx #0
lda debug_mark_box
ldx #35
ldy scratch_row
jsr debughex
ldx #0
lda debug_paint_box
ldx #38
ldy scratch_row
jsr debughex
; dec scratch_row
; ldx #34
; ldy scratch_row
; lda #'t'
; jsr fastfont
; ldx #0
; lda tdamageindex1
; ldx #35
; ldy scratch_row
; jsr debughex
; ldx #0
; lda tdamageindex2
; ldx #38
; ldy scratch_row
; jsr debughex
;
; dec scratch_row
; ldx #34
; ldy scratch_row
; lda #'p'
; jsr fastfont
; ldx #0
; lda debug_mark_box
; ldx #35
; ldy scratch_row
; jsr debughex
; ldx #0
; lda debug_paint_box
; ldx #38
; ldy scratch_row
; jsr debughex
; amidar 4
dec scratch_row

View File

@ -870,10 +870,10 @@ check_collisions nop
bmi end_collisions ; negative = end
beq ?enemy ; zero = skip
lda actor_row,y
cpy r
beq start_exploding
cmp r
bne ?enemy
lda actor_col,y
cpy c
cmp c
bne ?enemy
; def start_exploding():

2
main.s
View File

@ -262,7 +262,7 @@ game_loop nop
jsr paint_boxes
jsr renderstart
jsr pageflip
;jsr debug_player
jsr debug_player
;jsr wait
jmp game_loop