From 280d19876c67f4520aa7e0d21960a10326ec440c Mon Sep 17 00:00:00 2001 From: Lucas Scharenbroich Date: Wed, 22 Jun 2022 00:09:08 -0500 Subject: [PATCH] Fix a nasty macro/lup bug --- src/render/Fast.s | 20 ++++++++++---------- src/render/Slow.s | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/render/Fast.s b/src/render/Fast.s index 9391692..da51d13 100644 --- a/src/render/Fast.s +++ b/src/render/Fast.s @@ -63,14 +63,14 @@ _SpriteOverVFast ]dest equ 0 lup 8 ldal tiledata+{]src*4},x - and tmp_sprite_mask+{]line*4} - ora tmp_sprite_data+{]line*4} - sta: $0004+{]line*$1000},y + and tmp_sprite_mask+{]dest*4} + ora tmp_sprite_data+{]dest*4} + sta: $0004+{]dest*$1000},y ldal tiledata+{]src*4}+2,x - and tmp_sprite_mask+{]line*4}+2 - ora tmp_sprite_data+{]line*4}+2 - sta: $0001+{]line*$1000},y + and tmp_sprite_mask+{]dest*4}+2 + ora tmp_sprite_data+{]dest*4}+2 + sta: $0001+{]dest*$1000},y ]src equ ]src-1 ]dest equ ]dest+1 --^ @@ -135,15 +135,15 @@ _SpriteUnderVFast ]src equ 7 ]dest equ 0 lup 8 - lda tmp_sprite_data+{]line*4} + lda tmp_sprite_data+{]dest*4} andl tiledata+{]src*4}+32,x oral tiledata+{]src*4},x - sta: $0004+{]line*$1000},y + sta: $0004+{]dest*$1000},y - lda tmp_sprite_data+{]line*4}+2 + lda tmp_sprite_data+{]dest*4}+2 andl tiledata+{]src*4}+32+2,x oral tiledata+{]src*4}+2,x - sta: $0001+{]line*$1000},y + sta: $0001+{]dest*$1000},y ]src equ ]src-1 ]dest equ ]dest+1 --^ diff --git a/src/render/Slow.s b/src/render/Slow.s index 4254fc7..8cb23d7 100644 --- a/src/render/Slow.s +++ b/src/render/Slow.s @@ -76,7 +76,7 @@ FillPEAOpcode sta: $0003+{]line*$1000},y ]line equ ]line+1 --^ - rep #$20 + rep #$20 rts ; This is a dtub; will be removed eventually