From 43004af546f83eae6ad2699ad535f6b2ecd1345d Mon Sep 17 00:00:00 2001 From: 4am Date: Fri, 8 May 2020 15:54:31 -0400 Subject: [PATCH] fix can-scroll-puzzle logic --- notes | 2 +- src/puzzle.a | 18 +++++++----------- src/ui.play.a | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/notes b/notes index 6d9a92e..352cb0e 100644 --- a/notes +++ b/notes @@ -1,3 +1,3 @@ Playtesting bugs: -6x4-003 does not recognize UNFREE +4x3-007 does not recognize WHET diff --git a/src/puzzle.a b/src/puzzle.a index 04b407a..3aecbc7 100644 --- a/src/puzzle.a +++ b/src/puzzle.a @@ -178,10 +178,9 @@ ScrollPuzzleDown ; out: C clear if puzzle was scrolled down ; C set if puzzle was already as far down as it can go ; preserves X/Y - lda puzzle_offsets, y - cmp #4 - beq @fail - + lda puzzle_data3, y + beq + +ScrollPuzzleDownUnconditionally lda puzzle_data7, y sta puzzle_data8, y @@ -215,7 +214,7 @@ ScrollPuzzleDown sta puzzle_offsets, y clc rts -@fail sec ++ sec rts ScrollPuzzleUp @@ -223,11 +222,8 @@ ScrollPuzzleUp ; out: C clear if puzzle was scrolled up ; C set if puzzle was already as far up as it can go ; preserves X/Y - lda puzzle_offsets, y - clc - adc puzzle_logical_height - cmp #5 - beq @fail + lda puzzle_data5, y + beq + lda puzzle_data1, y sta puzzle_data0, y @@ -262,7 +258,7 @@ ScrollPuzzleUp sta puzzle_offsets, y clc rts -@fail sec ++ sec rts IsPuzzleComplete diff --git a/src/ui.play.a b/src/ui.play.a index af8f08f..3b7f6bb 100644 --- a/src/ui.play.a +++ b/src/ui.play.a @@ -275,7 +275,7 @@ AnimatePuzzleIntoPlace sty @max+1 ldy #0 -- ldx #4 -- jsr ScrollPuzzleDown +- jsr ScrollPuzzleDownUnconditionally jsr ScrollDown dex bne -