From 2cf2680aaa9ac71aa412ebace9d94b5a732b3869 Mon Sep 17 00:00:00 2001 From: Safiire Date: Sun, 22 Feb 2015 23:57:05 -0800 Subject: [PATCH] Fixed the scroll demo, made the sprite move correctly --- mario.chr | Bin 8192 -> 0 bytes scroll.asm | 16 +++++++++------- whatever.inc | 2 -- 3 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 mario.chr delete mode 100644 whatever.inc diff --git a/mario.chr b/mario.chr deleted file mode 100644 index d150cccdfb35f2cf6ee6124dc9839cb43f35fdf8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8192 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 diff --git a/scroll.asm b/scroll.asm index f4cf7a8..c0afde0 100644 --- a/scroll.asm +++ b/scroll.asm @@ -7,9 +7,10 @@ ; I just rewrote it to have something interesting to test my assembler on. ; Saf 2015 ; - ; Create an iNES header - .ines {"prog": 1, "char": 1, "mapper": 0, "mirror": 0} +; Create an iNES header +.ines {"prog": 1, "char": 1, "mapper": 0, "mirror": 0} +; Let's use labels to point to areas of SRAM ; SRAM ; I have no way to do this right now, but I need to add ; the ability to simply name parts of memory with a sort @@ -189,7 +190,7 @@ update_sprite: lda #>sprite sta $4014 ; Jam page $200-$2FF into SPR-RAM - lda $05 ; sprite+3 Is this right??? + lda $0203 ; sprite+3 Is this right??? beq hit_left cmp #$F7 bne edge_done @@ -207,8 +208,8 @@ hit_left: edge_done: ; update X and store it. clc - adc $00 ; dx - sta $05 ; sprite+3 Is this right? + adc $00 ; dx + sta $0203 ; sprite+3 Is this right? rts react_to_input: @@ -240,7 +241,8 @@ a_done: dex stx sprite -not_up: lda $4016 ; Down +not_up: + lda $4016 ; Down and #$01 beq not_dn ldx sprite @@ -271,7 +273,7 @@ scroll_screen: stx $02 ; scroll lda #$00 sta $2005 ; Write 0 for Horiz. Scroll value - STX $2005 ; Write the value of 'scroll' for Vert. Scroll value + stx $2005 ; Write the value of 'scroll' for Vert. Scroll value no_scroll: rts diff --git a/whatever.inc b/whatever.inc deleted file mode 100644 index 856242f..0000000 --- a/whatever.inc +++ /dev/null @@ -1,2 +0,0 @@ - - ޭޭޭޭޭޭޭޭ \ No newline at end of file