From 7ba76d4a5c45aedb1e56214349771dda465614b1 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Thu, 24 Jun 2021 14:35:31 -0500 Subject: [PATCH] Partial revert of VRAM adjustment --- owrando.asm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/owrando.asm b/owrando.asm index 7261a17..7428251 100644 --- a/owrando.asm +++ b/owrando.asm @@ -231,14 +231,16 @@ OWNewDestination: inc : pha : lda $06 : and #$fe00 : !add 1,s : sta $06 : pla ; adjust and set other VRAM addresses - lda.w $0006,x : pha : lda $06 : !sub 1,s - jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : pha ; number of tiles - lda $418 : dec #2 : bmi + - pla : pea $0000 : bra ++ ;pla : asl #7 : pha : bra ++ ; y-axis shifts VRAM by increments of 0x80 (disabled for now) - + pla : asl : pha ; x-axis shifts VRAM by increments of 0x02 - ++ lda $84 : !add 1,s : sta $84 : pla : pla - LDA $84 : SEC : SBC #$0400 : AND #$0F00 : ASL : XBA : STA $88 - LDA $84 : SEC : SBC #$0010 : AND #$003E : LSR : STA $86 + lda OWMode : and #$00ff : bne .modifyOtherVram + lda.w $0006,x : pha : lda $06 : !sub 1,s + jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : pha ; number of tiles + lda $418 : dec #2 : bmi + + pla : pea $0000 : bra ++ ;pla : asl #7 : pha : bra ++ ; y-axis shifts VRAM by increments of 0x80 (disabled for now) + + pla : asl : pha ; x-axis shifts VRAM by increments of 0x02 + ++ lda $84 : !add 1,s : sta $84 : pla : pla + .modifyOtherVram + LDA $84 : SEC : SBC #$0400 : AND #$0F00 : ASL : XBA : STA $88 + LDA $84 : SEC : SBC #$0010 : AND #$003E : LSR : STA $86 .adjustMainAxis pla : pla : sep #$10 : ldy $418