From 5c2df8b6a647bb106b21859258b183418f2949de Mon Sep 17 00:00:00 2001 From: aerinon Date: Tue, 3 Nov 2020 10:12:48 -0700 Subject: [PATCH] Scroll fix --- scroll.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scroll.asm b/scroll.asm index 133f4d1..299b995 100644 --- a/scroll.asm +++ b/scroll.asm @@ -177,20 +177,20 @@ ScrollX: ;change the X offset variables rts LimitXCamera: - cmp #$0080 : !bge + + cmp #$0079 : !bge + lda #$0000 : bra .end - + cmp #$0181 : !blt + - lda #$0180 - + !sub #$0080 + + cmp #$0178 : !blt + + lda #$0178 + + !sub #$0078 .end rts CheckRoomLayoutX: jsr LoadRoomLayout ;switches to 8-bit cmp #$04 : !blt .lock cmp #$05 : bne + - lda $04 : cmp #$f8 : beq .lock + lda $06 : cmp #$ff : beq .lock + cmp #$06 : bne .free - lda $04 : cmp #$f8 : bne .lock + lda $06 : cmp #$ff : bne .lock .free rep #$30 : clc : rts .lock rep #$30 : sec : rts