remove ram dependency

Author: zohassadar

src/modes/crunch.asm

@@ -16,25 +16,22 @@
 ; E - 3 left 2 right
 ; F - 3 left 3 right
 
-advanceGameCrunch:
-; initialize vars
-    lda crunchModifier
-    lsr
-    lsr
-    sta crunchLeftColumns
-    lda crunchModifier
-    and #$03
-    clc
-    adc crunchLeftColumns ; carry still clear
-    eor #$FF
-    adc #$0B ; 10 + 1 to get two's complement.  result is playable column count
-    sta crunchClearColumns
+; defined in playstate/completedrows.asm:
+;   crunchLeftColumns = generalCounter3
+;   crunchClearColumns = generalCounter4
 
+advanceGameCrunch:
+; populate vars
+    jsr unpackCrunchModifier
 ; initialize playfield row 19 to 0
     lda #$13
     sta generalCounter
 @nextRow:
-    jsr advanceSidesInit
+    ldy generalCounter
+    lda multBy10Table,y
+; playfieldAddr ends restored to 0 as top row is done last
+    sta playfieldAddr
+    jsr advanceSidesContinue
     dec generalCounter
     bpl @nextRow
 
@@ -44,16 +41,13 @@ advanceGameCrunch:
 crunchReturn:
     rts
 
-; for init only.  row determined by generalCounter
-; playfieldAddr ends restored to 0 as top row is done last
-advanceSidesInit:
-    ldy generalCounter
-    lda multBy10Table,y
-    sta playfieldAddr
-
-; after init, only top row is drawn.  using (playfieldAddr),y defaults to top row
-; as playfieldAddr is 0 when this is called (and most of the time)
 advanceSides:
+    ; called in playState_checkForCompletedRows
+    ; after init, only top row is drawn.  using (playfieldAddr),y defaults to top row
+    ; as playfieldAddr is 0 when this is called (and most of the time)
+    jsr unpackCrunchModifier
+
+advanceSidesContinue:
     ldy #$00
     lda #BLOCK_TILES
 
@@ -80,3 +74,18 @@ advanceSides:
     sta (playfieldAddr),y
     iny
     bne @rightLoop ; unconditional
+
+unpackCrunchModifier:
+ ; initialize vars
+    lda crunchModifier
+    lsr
+    lsr
+    sta crunchLeftColumns ; generalCounter3
+    lda crunchModifier
+    and #$03
+    clc
+    adc crunchLeftColumns ; carry still clear
+    eor #$FF
+    adc #$0B ; 10 + 1 to get two's complement.  result is playable column count
+    sta crunchClearColumns ; generalCounter4
+    rts

src/playstate/completedrows.asm

@@ -1,3 +1,5 @@
+crunchLeftColumns := generalCounter3
+crunchClearColumns := generalCounter4
 activeFloorMode := generalCounter5
 
 playState_checkForCompletedRows:

src/playstate/util.asm

@@ -88,10 +88,12 @@ updateMusicSpeed:
         bne @notCrunch
 
         ; start at first clear column and repeat only for playable columns
+        jsr unpackCrunchModifier
+        tya
         clc
-        adc crunchLeftColumns ; accumulator is still 50, offset with left columns
+        adc crunchLeftColumns ; offset y with left column count (generalCounter3)
         tay
-        ldx crunchClearColumns
+        ldx crunchClearColumns ; generalCounter4
         bne @checkForBlockInRow ; unconditional, expected range 4 - 10
 
 @notCrunch:

src/ram.asm

@@ -220,10 +220,8 @@ dasOnlyShiftDisabled: .res 1 ; $63A
 invisibleFlag: .res 1 ; $63B  ; 0 for normal mode, non-zero for Invisible playfield rendering.  Reset on game init and game over.
 currentFloor: .res 1 ; $63C floorModifier is copied here at game init.  Set to 0 otherwise and incremented when linecap floor.
 mapperId: .res 1 ; $63D ; For INES_MAPPER 1000 (autodetect).  0 = CNROM.  1 = MMC1.
-crunchLeftColumns: .res 1
-crunchClearColumns: .res 1 ; playable column count
 
-    .res $35
+    .res $37
 
 .if KEYBOARD
 newlyPressedKeys: .res 1 ; $0675