From a7bd8bbc62af8ae5b9ae5beb37850324c5036db7 Mon Sep 17 00:00:00 2001 From: karri Date: Sun, 2 Dec 2012 11:45:36 +0000 Subject: [PATCH] Fix bug in cls git-svn-id: svn://svn.cc65.org/cc65/trunk@5944 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/lynx/lynx-160-102-16.s | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/libsrc/lynx/lynx-160-102-16.s b/libsrc/lynx/lynx-160-102-16.s index 6923ed678..f5d9e2ece 100644 --- a/libsrc/lynx/lynx-160-102-16.s +++ b/libsrc/lynx/lynx-160-102-16.s @@ -260,19 +260,17 @@ CONTROL: cmp #5 bne ControlSwap - lda ptr1 ; Activate/deactivate collission detection + lda ptr1 ; Activate/deactivate collision detection bne @L0 - lda #%11000001 ; tgi_clear does not erase collision buffer + lda #%00000001 ; tgi_clear does not erase collision buffer sta cls_sprite - lda #%00100000 + lda #%00100000 sta cls_sprite+2 lda __sprsys ora #$20 bra @L1 -@L0: - lda #%11000000 ; tgi_clear erases collision buffer +@L0: lda #%00000000 ; tgi_clear erases collision buffer sta cls_sprite - lda #%00000000 sta cls_sprite+2 lda __sprsys and #$df @@ -385,13 +383,13 @@ draw_sprite: ; Draw it in render buffer .rodata pixel_bitmap: - .byte 2,%00010000, 0 ; A pixel bitmap + .byte 3,%10000100,%00000000, $0 ; A pixel bitmap .data -collindex: +cls_coll: .byte 0 cls_sprite: - .byte %11000001 ; A pixel sprite - .byte %10010000 + .byte %00000001 ; A pixel sprite + .byte %00010000 .byte %00100000 .addr 0,pixel_bitmap .word 0 @@ -937,20 +935,20 @@ OUTTEXT: .data text_coll: - .byte 0 + .byte 0 text_sprite: - .byte $00,$90,$20 - .addr 0, text_bitmap + .byte $00,$90,$20 + .addr 0, text_bitmap text_x: - .word 0 + .word 0 text_y: - .word 0 + .word 0 text_sx: - .word $100 + .word $100 text_sy: - .word $100 + .word $100 text_c: - .byte 0 + .byte 0 .rodata ; The Font -- 2.39.5