Apple-2-SW/fujirun
1
0
Fork 0
mirror of https://github.com/robmcmullen/fujirun.git synced 2024-06-15 16:29:44 +00:00
Code Issues Projects Releases Wiki Activity

Fixed player freeze above row 5

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
debug.s
View File

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

6
logic.s
View File

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

2
main.s
View File

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