squashed merge of master

Author: zohassadar

CHANGELOG.md

@@ -2,19 +2,21 @@
 
 ## [unreleased]
 * Crunch Mode
-* Invisible linecap turns entire playfield invisible
-* Invisible mode preserves original piece colors
+* Marathon Mode
+* Added hidden score option
+* M Scoring changed to just add a millions counter to Classic Scoring
 * Famicom Keyboard support
-* Fixed Floor-0 disabled burns
 * MMC3 Support
 * MMC5 Support
+* Invisible linecap turns entire playfield invisible
+* Invisible mode preserves original piece colors
+* Floor no longer gobbled up by top line clear
+* Floor 0 has original no-burns behaviour again
 * Fixed CNROM legal screen CHR bank
 * Fixed CNROM legal to title flicker
+* Fixed ingame score display at 8 million with Classic Scoring
 * Block Tool pieces wrap around
-* 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)

README.md

@@ -21,6 +21,7 @@
     * [Tap Quantity](#tap-quantity)
     * [Checkerboard](#checkerboard)
     * [Transition](#transition)
+    * [Marathon](#marathon)
     * [Garbage](#garbage)
     * [Drought](#drought)
     * [DAS Delay](#das-delay)

build.js

@@ -29,6 +29,7 @@ if (args.includes('-h')) {
 -w  force WASM compiler
 -c  force PNG to CHR conversion
 -o  override autodetect mmc1 header with cnrom
+-t  run tests (requires cargo)
 -h  you are here
 `);
     process.exit(0);
@@ -174,8 +175,9 @@ if (!fs.existsSync('clean.nes')) {
 } else {
     console.time('patch');
     const patcher = require('./tools/patch/create');
-    patcher('clean.nes', 'tetris.nes', 'tetris.bps');
+    const pct = patcher('clean.nes', 'tetris.nes', 'tetris.bps');
     console.timeEnd('patch');
+    console.log(`using ${pct}% of original file`);
 }
 
 // stats
@@ -203,3 +205,8 @@ hashFile('tetris.bps');
 console.log();
 
 console.timeEnd('build');
+
+if (args.includes('-t')) {
+    console.log('\nrunning tests');
+    handleSpawn('cargo', ...'run --release --manifest-path tests/Cargo.toml -- -t'.split(' '));
+}

src/constants.asm

@@ -113,7 +113,7 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
 
 ; menuConfigSizeLookup
 ; menu ram is defined at menuRAM in ./ram.asm
-.macro MENUSIZES 
+.macro MENUSIZES
     .byte $0    ; MODE_TETRIS
     .byte $0    ; MODE_TSPINS
     .byte $0    ; MODE_SEED

src/nmi/pollkeyboard.asm

@@ -10,7 +10,7 @@
 ;       |+--- Select column, row is incremented if this bit goes from high to low.
 ;       +---- Enable keyboard matrix (if 0, all voltages inside the keyboard will be 5V, reading back as logical 0 always)
 
-; Incrementing the row from the (keyless) 10th row will cause it to wrap back to the first row. 
+; Incrementing the row from the (keyless) 10th row will cause it to wrap back to the first row.
 
 ; Output ($4017 read)
 
@@ -50,14 +50,14 @@ pollKeyboard:
         sta JOY1
         ldy #$0A
 @avoidParasiticCapacitance:              ; wait approx 50 cycles after advancing rows
-        dey                 
+        dey
         bne @avoidParasiticCapacitance
         lda JOY2_APUFC
         and #KB_MASK
         sta generalCounter
         lda #KB_COL_1
         sta JOY1
-        lda JOY2_APUFC      
+        lda JOY2_APUFC
         and #KB_MASK
         lsr
         sta keyboardInput,x
@@ -129,7 +129,7 @@ mapKeysToButtons:
         ora #BUTTON_RIGHT
         sta newlyPressedKeys
 @skipRightRead:
-@rightNotPressed: 
+@rightNotPressed:
 
         ldy #$07     ; grph -> B
         ldx #$06
@@ -168,7 +168,7 @@ mapKeysToButtons:
 @startNotPressed:
 
 
-; Separate Newly Pressed from Held 
+; Separate Newly Pressed from Held
         lda newlyPressedKeys
         tay
         eor heldKeys
@@ -189,6 +189,6 @@ mapKeysToButtons:
 keyMask:
         .byte $80,$40,$20,$10,$08,$04,$02,$01
 readKey:
-	lda keyboardInput,y
-	and keyMask,x
-	rts
+    lda keyboardInput,y
+    and keyMask,x
+    rts

src/nmi/render_mode_play_and_demo.asm

@@ -123,7 +123,6 @@ render_mode_play_and_demo:
         cmp #SCORING_FLOAT
         bne @noFloat
         jsr renderFloat
-        jmp @clearScoreRenderFlags
 @noFloat:
 
         jsr renderClassicScore

src/nmi/render_score.asm

@@ -80,7 +80,6 @@ renderFloat:
         ror
         ror
         sta PPUDATA
-        jsr renderBCDScore
         rts
 
 renderLevelDash:
@@ -196,6 +195,7 @@ getScoreDiv100k:
         lsr
         lsr
         lsr
+        clc
         tax
         lda multBy100Table, x
         adc tmpZ

src/sprites/piece.asm

@@ -83,7 +83,7 @@ stageSpriteForCurrentPiece_actual:
         ldy oamStagingLength
         lda #$04
         sta generalCounter2
-@stageMino:  
+@stageMino:
         lda orientationTable,x
         asl a
         asl a
@@ -116,7 +116,7 @@ stageSpriteForCurrentPiece_actual:
         sta oamStaging,y
         jmp @finishLoop
 
-@validYCoordinate:  
+@validYCoordinate:
         inc oamStagingLength
         iny
         lda orientationTable,x
@@ -126,7 +126,7 @@ stageSpriteForCurrentPiece_actual:
         clc
         adc generalCounter3
         sta oamStaging,y
-@finishLoop:  
+@finishLoop:
         inc oamStagingLength
         iny
         inx

src/util/check_region.asm

@@ -3,19 +3,19 @@ checkRegion:
 
 ; region detection via http://forums.nesdev.com/viewtopic.php?p=163258#p163258
 ;;; use the power-on wait to detect video system-
-	ldx #0
+    ldx #0
         stx palFlag ; extra zeroing
-	ldy #0
+    ldy #0
 @vwait1:
-	bit $2002
-	bpl @vwait1  ; at this point, about 27384 cycles have passed
+    bit $2002
+    bpl @vwait1  ; at this point, about 27384 cycles have passed
 @vwait2:
-	inx
-	bne @noincy
-	iny
+    inx
+    bne @noincy
+    iny
 @noincy:
-	bit $2002
-	bpl @vwait2  ; at this point, about 57165 cycles have passed
+    bit $2002
+    bpl @vwait2  ; at this point, about 57165 cycles have passed
 @endVWait:
 
 ;;; BUT because of a hardware oversight, we might have missed a vblank flag.
@@ -24,16 +24,16 @@ checkRegion:
 ;;; PAL NES:  33247 cycles / 12.005 -> $AD1 or $15A2
 ;;; Dendy:    35464 cycles / 12.005 -> $B8A or $1714
 
-	tya
-	cmp #16
-	bcc @nodiv2
-	lsr
+    tya
+    cmp #16
+    bcc @nodiv2
+    lsr
 @nodiv2:
-	clc
-	adc #<-9
-	cmp #3
-	bcc @noclip3
-	lda #3
+    clc
+    adc #<-9
+    cmp #3
+    bcc @noclip3
+    lda #3
 @noclip3:
 ;;; Right now, A contains 0,1,2,3 for NTSC,PAL,Dendy,Bad
         cmp #0

src/util/core.asm

@@ -61,9 +61,9 @@ updateAudioWaitForNmiAndResetOamStaging:
         beq @checkForNmi
 
 resetOAMStaging:
-; Hide a sprite by moving it down offscreen, by writing any values between #$EF-#$FF here. 
-; Sprites are never displayed on the first line of the picture, and it is impossible to place 
-; a sprite partially off the top of the screen. 
+; Hide a sprite by moving it down offscreen, by writing any values between #$EF-#$FF here.
+; Sprites are never displayed on the first line of the picture, and it is impossible to place
+; a sprite partially off the top of the screen.
 ; https://www.nesdev.org/wiki/PPU_OAM
         ldx #$00
         lda #$FF