Merge pull request #50 from zohassadar/floor

make floor mode with top row bug not gobble up floor rows

Author: kirjavascript

CHANGELOG.md

@@ -14,6 +14,7 @@
 * Added hidden score option
 * Added marathon mode
 * 0001 seeds are ignored
+* Floor no longer gobbled up by top line clear
 
 ## [v5 tournament]
 * Linecap Menu (from CTM Masters September 2022)

src/playstate/completedrows.asm

@@ -1,3 +1,5 @@
+activeFloorMode := generalCounter5
+
 playState_checkForCompletedRows:
         lda vramRow
         cmp #$20
@@ -23,8 +25,9 @@ playState_checkForCompletedRows:
         adc generalCounter
         sta generalCounter
         tay
+        lda #$00
+        sta activeFloorMode ; Don't draw floor unless active
         ldx #$0A
-
 @checkIfRowComplete:
 .if AUTO_WIN
         jmp @rowIsComplete
@@ -46,24 +49,14 @@ playState_checkForCompletedRows:
         beq @rowNotComplete
 
 @fullRowBurningCheck:
-        ; bugfix to ensure complete rows aren't cleared
-        ; used in floor / linecap floor
-        lda currentPiece_copy
-        beq @IJLTedge
-        cmp #5
-        beq @IJLTedge
-        cmp #$10
-        beq @IJLTedge
-        cmp #$12
-        beq @IJLTedge
-        bne @normalRow
-@IJLTedge:
-        lda lineIndex
-        cmp #3
-        bcs @rowNotComplete
+        inc activeFloorMode ; Floor is active
+        lda #$13
+        sec
+        sbc generalCounter2 ; contains current row being checked
+        cmp floorModifier
+        bcc @rowNotComplete ; ignore floor rows
 @normalRow:
 
-
 @checkIfRowCompleteLoopStart:
         lda (playfieldAddr),y
         cmp #EMPTY_TILE
@@ -99,6 +92,23 @@ playState_checkForCompletedRows:
         bne @clearRowTopRow
         lda #$13
         sta currentPiece
+
+; draw surface of floor in case of top line clear
+        lda activeFloorMode
+        beq @incrementLineIndex
+        lda #$14
+        sec
+        sbc floorModifier
+        tax
+        ldy multBy10Table,x
+        ldx #$0A
+        lda #BLOCK_TILES
+@drawFloorSurface:
+        sta playfield,y
+        iny
+        dex
+        bne @drawFloorSurface
+
         jmp @incrementLineIndex
 
 @rowNotComplete:

src/playstate/lock.asm

@@ -42,7 +42,6 @@ playState_lockTetrimino:
         adc tetriminoX
         sta generalCounter
         lda currentPiece
-        sta currentPiece_copy
         asl a
         asl a
         sta generalCounter2

src/ram.asm

@@ -39,7 +39,7 @@ lines: .res 2 ; $0050
 rowY: .res 1 ; $0052
 linesBCDHigh: .res 1 ; $53
 linesTileQueue: .res 1 ; $54
-currentPiece_copy: .res 1 ; $55 ; used in floor code checking
+    .res 1
 completedLines: .res 1 ; $0056
 lineIndex: .res 1 ; $0057                        ; Iteration count of playState_checkForCompletedRows
 startHeight: .res 1 ; $0058