Merge remote-tracking branch 'origin/master' into keyboard_score_entry

Author: zohassadar

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [unreleased]
+
+* Fixed a glitch when using Crash Mode + Crunch Mode
+* Fixed a glitch in Hard Drop Mode
+* Fixed line based floor caps outside of levelups
+* Reset scores when no SRAM is present
+
 ## v6
 * Crunch Trainer
 * Marathon Trainer
@@ -58,9 +65,9 @@
 * Start on any level
 * Rewrite of all scoring code
     * Classic scoring
-    * Millions counter 
+    * Millions counter
     * 7 digit score
-    * 999999 scorecap 
+    * 999999 scorecap
     * Fixed T-Spin scoring
     * Crash free with no long frames
 * Rewrite of all highscore code
@@ -83,7 +90,7 @@
 * Added option to disable tetris flashing
 * Changes made to more closely match the original ROM
     * Restore seed shredding on level menu
-    * Hold `select` to start in Qual Mode and reset level cursor 
+    * Hold `select` to start in Qual Mode and reset level cursor
     * Transition from Legal to Title screen after 512 frames
     * Hide next box between Curtain and Rocket
     * Persist Qual Mode (and menu config) between reset button presses
@@ -153,7 +160,7 @@
 - Garbage Trainer
     - Always Tetris Ready
     - Normal Garbage
-    - Smart Garbage 
+    - Smart Garbage
     - Hard Garbage
     - Infinite Digging
 - Piece distribution in Setups Trainer is now even

build.js

@@ -19,7 +19,7 @@ const mappers = { // https://www.nesdev.org/wiki/Mapper
 const args = process.argv.slice(2);
 
 if (args.includes('-h')) {
-    console.log(`usage: node build.js [-h] [-v] [-m<${Object.keys(mappers).join('|')}>] [-a] [-s] [-k] [-w]
+    console.log(`usage: node build.js [-h] [-v] [-m<${Object.keys(mappers).join('|')}>] [-a] [-s] [-k] [-w] [-- (ca65 args)]
 
 -m  mapper
 -a  faster aeppoz + press select to end game
@@ -29,6 +29,7 @@ if (args.includes('-h')) {
 -c  force PNG to CHR conversion
 -o  override autodetect mmc1 header with cnrom
 -t  run tests (requires cargo)
+-T  run single test
 -h  you are here
 `);
     process.exit(0);
@@ -87,6 +88,13 @@ if (args.includes('-o')) {
     console.log('cnrom override for autodetect');
 }
 
+// pass additional arguments to ca65
+if (args.includes('--')) {
+    const ca65Flags = args.slice(1+args.indexOf('--'));
+    compileFlags.push(...ca65Flags);
+    args.splice(args.indexOf('--'), 1+ca65Flags.length);
+}
+
 console.log();
 
 // build / compress nametables
@@ -126,15 +134,22 @@ console.timeEnd('CHR');
 
 const { spawnSync } = require('child_process');
 
+function execArgs(exe, args) {
+    const result = spawnSync(exe, args);
+    if (result.stderr.length) {
+        console.error(result.stderr.toString());
+    }
+    if (result.stdout.length) {
+        console.log(result.stdout.toString());
+    }
+    if (result.status) {
+        process.exit(result.status);
+    }
+}
+
 function exec(cmd) {
     const [exe, ...args] = cmd.split(' ');
-    const output = spawnSync(exe, args).output.flatMap(
-        (d) => d?.toString() || [],
-    );
-    if (output.length) {
-        console.log(output.join('\n'));
-        process.exit(0);
-    }
+    execArgs(exe, args)
 }
 
 const ca65bin = nativeCC65 ? 'ca65' : 'node ./tools/assemble/ca65.js';
@@ -199,7 +214,15 @@ console.log();
 
 console.timeEnd('build');
 
+// tests
+
 if (args.includes('-t')) {
     console.log('\nrunning tests');
     exec('cargo run --release --manifest-path tests/Cargo.toml -- -t');
 }
+
+if (args.includes('-T')) {
+    const singleTest = args.slice(1+args.indexOf('-T')).join(' ');
+    console.log(`\nrunning single test: ${singleTest}`);
+    execArgs('cargo', [...'run --release --manifest-path tests/Cargo.toml -- -T'.split(' '), singleTest]);
+}

src/audio.asm

@@ -73,6 +73,12 @@ copyToApuChannel:
         ldy #$00
 @copyByte:
         lda (AUDIOTMP3),y
+.if SWAP_DUTY_CYCLES
+        cpy #0
+        bne @notFirstByte
+        jsr swapDutyCycles
+@notFirstByte:
+.endif
         sta (AUDIOTMP1),y
         iny
         tya
@@ -137,15 +143,9 @@ advanceAudioSlotFrame:
         sta soundEffectSlot0FrameCounter,x
 @ret:   rts
 
-unreferenced_data3:
-        .byte   $FF,$FF,$FF,$FF,$FF,$FF,$FF,$FF
-        .byte   $FF,$FF,$FF,$FF,$FF,$FF,$FF,$FF
-        .byte   $FF,$FF,$FF,$FF,$FF,$FF,$FF,$FF
-        .byte   $00,$00,$00,$00,$00,$00,$00,$00
-        .byte   $00,$00,$00,$00,$00,$00,$00,$00
-        .byte   $00,$00,$00,$00,$00,$00,$00,$00
-        .byte   $00,$00,$00,$00,$00,$00,$00,$00
-        .byte   $03,$7F,$0F,$C0
+.align $100
+        .byte $00 ; pad so low byte is not zero.  See tya in initSoundEffectShared
+
 ; Referenced by initSoundEffectShared
 soundEffectSlot0_gameOverCurtainInitData:
         .byte   $1F,$7F,$0F,$C0
@@ -473,6 +473,9 @@ soundEffectSlot1_chirpChirpPlaying:
         and #$03
         tay
         lda soundEffectSlot1_chirpChirpSq1Vol_table,y
+.if SWAP_DUTY_CYCLES
+        jsr swapDutyCycles
+.endif
         sta SQ1_VOL
         inc soundEffectSlot1SecondaryCounter
         lda soundEffectSlot1SecondaryCounter
@@ -623,6 +626,10 @@ LE442:  jsr copyToSq1Channel
         sta SQ1_LO
         ldy soundEffectSlot1SecondaryCounter
         lda sq1vol_unknown2_table,y
+.if SWAP_DUTY_CYCLES
+        jsr swapDutyCycles
+        tay ; set z flag based on a; y can be safely clobbered
+.endif
         sta SQ1_VOL
         bne LE46F
         lda soundEffectSlot1Playing
@@ -1070,6 +1077,9 @@ updateMusicFrame_setChanVol:
         bne @ret
         tya
         ldy musicChannelOffset
+.if SWAP_DUTY_CYCLES
+        jsr swapDutyCycles
+.endif
         sta SQ1_VOL,y
 @ret:   rts
 
@@ -1350,6 +1360,9 @@ updateMusicFrame_updateChannel:
 @useDirectVolume:
         lda AUDIOTMP1
 @setMmio:
+.if SWAP_DUTY_CYCLES
+        jsr swapDutyCycles
+.endif
         sta SQ1_VOL,y
         lda musicStagingSq1Sweep,x
         sta SQ1_SWEEP,y
@@ -1462,6 +1475,15 @@ musicGetNextInstructionByte:
         lda (musicChanTmpAddr),y
         rts
 
+.if SWAP_DUTY_CYCLES
+; input a: byte to be written to $4000 or $4004. output a: the same byte with the duty cycle index mapped from (0, 1, 2, 3) to (0, 2, 1, 3), counteracting the behavior of some clone consoles
+swapDutyCycles:
+        cmp #%01000000
+        bmi @ret ; branch if upper bits are not %01 or %10
+        eor #%11000000 ; swap between %01 and %10
+@ret:   rts
+.endif
+
 musicChanVolControlTable:
 noteToWaveTable:
 noteDurationTable:

src/constants.asm

@@ -27,6 +27,7 @@ NO_SFX := 0
 NO_MENU := 0
 ALWAYS_CURTAIN := 0
 QUAL_BOOT := 0
+SWAP_DUTY_CYCLES := 0 ; counters the duty cycle swap present in some clone consoles
 
 INITIAL_CUSTOM_LEVEL := 29
 INITIAL_LINECAP_LEVEL := 39

src/data/orientation.asm

@@ -30,20 +30,10 @@ orientationTable:
         .byte   $00,$00,$7B,$01,$00,$FF,$00,$00
         .byte   $FF,$00,$00,$FF,$00,$00,$FF,$00
 
-; Only cares about orientations selected by spawnTable
-orientationToSpriteTable:
-        .byte   $00,$00,$06,$00,$00,$00,$00,$09
-        .byte   $08,$00,$0B,$07,$00,$00,$0A,$00
-        .byte   $00,$00,$0C
-
 tetriminoTypeFromOrientation:
         .byte   $00,$00,$00,$00,$01,$01,$01,$01
         .byte   $02,$02,$03,$04,$04,$05,$05,$05
         .byte   $05,$06,$06
 spawnTable:
         .byte   $02,$07,$08,$0A,$0B,$0E,$12
         .byte   $02
-spawnOrientationFromOrientation:
-        .byte   $02,$02,$02,$02,$07,$07,$07,$07
-        .byte   $08,$08,$0A,$0B,$0B,$0E,$0E,$0E
-        .byte   $0E,$12,$12

src/gamemode/levelmenu.asm

@@ -77,7 +77,6 @@ gameMode_levelMenu_processPlayer1Navigation:
         lda newlyPressedButtons_player1
         sta newlyPressedButtons
 
-.if SAVE_HIGHSCORES
         lda levelControlMode
         cmp #4
         bne @notClearingHighscores
@@ -89,11 +88,15 @@ gameMode_levelMenu_processPlayer1Navigation:
         lda #0
         sta levelControlMode
         jsr resetScores
+.if SAVE_HIGHSCORES
+        jsr detectSRAM
+        beq @notResettingSavedScores
         jsr resetSavedScores
+@notResettingSavedScores:
+.endif
         jsr updateAudioWaitForNmiAndResetOamStaging
         jmp gameMode_levelMenu
 @notClearingHighscores:
-.endif
 
         jsr levelControl
         jsr levelMenuRenderHearts
@@ -191,7 +194,6 @@ levelControl:
         .addr   levelControlClearHighScores
         .addr   levelControlClearHighScoresConfirm
 
-.if SAVE_HIGHSCORES
 levelControlClearHighScores:
         lda #$20
         sta spriteXOffset
@@ -238,13 +240,7 @@ highScoreClearUpOrLeave:
         sta levelControlMode
 @ret:
         rts
-.else
-levelControlClearHighScores:
-levelControlClearHighScoresConfirm:
-        lda #0
-        sta levelControlMode
-        rts
-.endif
+
 
 levelControlCustomLevel:
         jsr handleReadyInput
@@ -324,10 +320,7 @@ MAX_HEARTS := 7
         jsr @changeHearts
 @checkUpPressed:
 
-.if SAVE_HIGHSCORES
         ; to clear mode
-        jsr detectSRAM
-        beq @notClearMode
         lda newlyPressedButtons
         cmp #BUTTON_DOWN
         bne @notClearMode
@@ -336,7 +329,6 @@ MAX_HEARTS := 7
         lda #$3
         sta levelControlMode
 @notClearMode:
-.endif
 
         ; to normal mode
         lda newlyPressedButtons

src/gamemodestate/initstate.asm

@@ -46,6 +46,7 @@ gameModeState_initGameState:
         sta dasOnlyShiftDisabled
         sta invisibleFlag
         sta currentFloor
+        sta crashState
 
 ; initialize currentFloor if necessary
         lda practiseType

src/gamemodestate/pause.asm

@@ -35,8 +35,7 @@ pause:
         sta renderMode
 
 @pauseSetupPart2:
-        jsr updateAudioAndWaitForNmi
-        jsr resetOAMStaging
+        jsr updateAudioWaitForNmiAndResetOamStaging
 
 @pauseLoop:
         lda qualFlag

src/main.asm

@@ -18,6 +18,7 @@
 
 ; region code at start of page to keep cycle count consistent
 .include "util/check_region.asm"
+.include "audio.asm"
 
 initRam:
 
@@ -31,7 +32,6 @@ mainLoop:
 @continue:
         jmp mainLoop
 
-.include "audio.asm"
 .include "nmi/nmi.asm"
 .include "nmi/render.asm"
 .include "nmi/pollcontroller.asm"