Squashed merge of upstream/master

Author: zohassadar

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)

build.js

@@ -6,14 +6,20 @@ const { spawnSync } = require('child_process');
 console.log('TetrisGYM buildscript');
 console.time('build');
 
-const mappers = [255, 1, 3, 4, 5];
+const mappers = { // https://www.nesdev.org/wiki/Mapper
+    1: 'MMC1',
+    3: 'CNROM',
+    4: 'MMC3',
+    5: 'MMC5',
+    255: 'Autodetect MMC1/CNROM',
+};
 
 // options handling
 
 const args = process.argv.slice(2);
 
 if (args.includes('-h')) {
-    console.log(`usage: node build.js [-h] [-v] [-m<${mappers.join('|')}>] [-a] [-s] [-k] [-w] [-c] [-o]
+    console.log(`usage: node build.js [-h] [-v] [-m<${Object.keys(mappers).join('|')}>] [-a] [-s] [-k] [-w]
 
 -m  mapper
 -a  faster aeppoz + press select to end game
@@ -45,9 +51,9 @@ console.log(`using ${nativeCC65 ? 'system' : 'wasm'} ca65/ld65`);
 
 const mapper = args.find((d) => d.startsWith('-m'))?.slice(2) ?? 255;
 
-if (!mappers.includes(+mapper)) {
+if (!mappers[mapper]) {
     console.error(
-        `Invalid INES_MAPPER - options are ${mappers
+        `invalid INES_MAPPER - options are ${Object.keys(mappers)
             .map((d) => `-m${d}`)
             .join(', ')}`,
     );
@@ -58,7 +64,7 @@ if (!mappers.includes(+mapper)) {
 
 compileFlags.push('-D', `INES_MAPPER=${mapper}`);
 
-console.log(`using mapper ${mapper}`);
+console.log(`using ${mappers[mapper]}`);
 
 if (args.includes('-a')) {
     compileFlags.push('-D', 'AUTO_WIN=1');

src/audio.asm

@@ -566,7 +566,7 @@ soundEffectSlot1_rotateTetriminoPlaying:
 soundEffectSlot1_tetrisAchievedInit:
         lda #$05
         ldy palFlag
-        cpy #0
+        ; cpy #0 ; ldy sets z flag
         beq @ntsc
         lda #$4
 @ntsc:
@@ -584,7 +584,7 @@ LE417:  jmp initSoundEffectShared
 soundEffectSlot1_lineCompletedInit:
         lda #$05
         ldy palFlag
-        cpy #0
+        ; cpy #0 ; ldy sets z flag
         beq @ntsc
         lda #$4
 @ntsc:
@@ -600,7 +600,7 @@ soundEffectSlot1_lineCompletedPlaying:
 soundEffectSlot1_lineClearingInit:
         lda #$04
         ldy palFlag
-        cpy #0
+        ; cpy #0 ; ldy sets z flag
         beq @ntsc
         lda #$3
 @ntsc:
@@ -692,7 +692,7 @@ LE4E9:  jmp soundEffectSlot1Playing_stop
 soundEffectSlot1_levelUpInit:
         lda #$06
         ldy palFlag
-        cpy #0
+        ; cpy #0 ; ldy sets z flag
         beq @ntsc
         lda #$5
 @ntsc:
@@ -773,10 +773,16 @@ updateMusic_noSoundJmp:
 updateMusic:
         lda musicTrack
         tay
+        ; old:
+        ; cmp #$FF
+        ; beq updateMusic_noSoundJmp
+        ; cmp #$00
+        ; beq @checkIfAlreadyPlaying
+
+        ; new:
+        beq @checkIfAlreadyPlaying ; tay sets z flag
         cmp #$FF
         beq updateMusic_noSoundJmp
-        cmp #$00
-        beq @checkIfAlreadyPlaying
         sta currentAudioSlot
         sta musicTrack_dec
         dec musicTrack_dec
@@ -1127,7 +1133,7 @@ updateMusicFrame_progLoadRoutine:
         iny
         lda (musicChanTmpAddr),y
         sta musicDataChanPtrDeref+1,x
-        cmp #$00
+        ; cmp #$00 ; lda sets z flag
         beq updateMusicFrame_progEnd
         cmp #$FF
         beq updateMusicFrame_progLoadNextScript

src/boot.asm

@@ -23,7 +23,7 @@
 @loop:
         dex
         sta menuRAM, x
-        cpx #0
+        ; cpx #0 ; dex sets z flag
         bne @loop
 
         ; default pace to A

src/gamemode/gametypemenu/menu.asm

@@ -210,7 +210,7 @@ seedControls:
         clc
         tay
         and #$F
-        cmp #$0
+        ; cmp #$0 ; and sets z flag
         bne @noWrapDown
         tya
         and #$F0
@@ -259,7 +259,7 @@ menuConfigControls:
         beq @skipLeftConfig
         ; check if zero
         lda menuVars, x
-        cmp #0
+        ; cmp #0 ; lda sets z flag
         beq @skipLeftConfig
         ; dec value
         dec menuVars, x

src/gamemode/waitscreen.asm

@@ -34,7 +34,7 @@ waitScreenLoad:
 
         lda #$FF
         ldx palFlag
-        cpx #0
+        ; cpx #0 ; ldx sets z flag
         beq @notPAL
         lda #$CC
 @notPAL:

src/gamemodestate/handlegameover.asm

@@ -7,7 +7,7 @@ gameModeState_handleGameOver:
         lda #$05
         sta generalCounter2
         lda playState
-        cmp #$00
+        ; cmp #$00 ; lda sets z flag
         beq @gameOver
         jmp @ret
 @gameOver:

src/gamemodestate/initstate.asm

@@ -300,7 +300,7 @@ L884A:
         lda #EMPTY_TILE
 L885D:  sta playfield,y
         dey
-        cpy #$0
+        ; cpy #$0 ; dey sets z flag
         bne L885D
         lda #$00
         sta vramRow

src/modes/debug.asm

@@ -3,7 +3,7 @@
 
 checkDebugGameplay:
         lda debugFlag
-        cmp #0
+        ; cmp #0 ; lda sets z flag
         beq @done
 
         ; sprite
@@ -91,7 +91,7 @@ DEBUG_ORIGINAL_Y := tmp1
 DEBUG_ORIGINAL_CURRENT_PIECE := tmp2
 
         lda debugFlag
-        cmp #0
+        ; cmp #0 ; lda sets z flag
         beq debugPauseDrawPieces
 
         jmp debugSelectMenuControls

src/modes/garbage.asm

@@ -93,7 +93,7 @@ randomGarbage:
         bcc @done
 
         lda garbageDelay
-        cmp #0
+        ; cmp #0 ; lda sets z flag
         bne @delay
 
         jsr random10