.github/workflows/testing.yml

@@ -0,0 +1,50 @@
+name: Testing
+
+on:
+  push:
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    # 22.04 suffers from https://github.com/TASEmulators/fceux/issues/413
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Add packages
+      run: |
+        sudo apt-get update
+        sudo apt-get install cc65 fceux
+
+    - name: Grab Dependencies
+      env:
+        ERSOFT_SECRET: ${{ secrets.ERSOFT_SECRET }}
+      run: |
+        mkdir -p ~/.local/bin
+        curl -L -u "$ERSOFT_SECRET" https://ejona.ersoft.org/taus-ci/flips -o ~/.local/bin/flips
+        chmod +x ~/.local/bin/flips
+        curl -OL -u "$ERSOFT_SECRET" https://ejona.ersoft.org/taus-ci/tetris.nes
+        curl -OL -u "$ERSOFT_SECRET" https://ejona.ersoft.org/taus-ci/tetris-pal.nes
+
+    - name: Build NTSC
+      run: |
+        make V=1
+        mv build/ build-ntsc/
+
+    - name: Build PAL
+      run: |
+        make V=1 PAL=1
+        mv build/ build-pal/
+
+    - name: Test NTSC
+      run: |
+        ln -snf build-ntsc/ build
+        xvfb-run -a make V=1 test
+
+    - name: Test PAL
+      run: |
+        ln -snf build-pal/ build
+        xvfb-run -a make V=1 PAL=1 test

.gitignore

@@ -1,2 +1,3 @@
 build/
 tetris.nes
+tetris-pal.nes

7bag-test.lua

@@ -0,0 +1,50 @@
+require("ypcall") -- must be first, as it changes globals
+require("asm")
+require("testing")
+
+local labels = asm.loadlabels("build/7bag.lbl")
+
+local spawnTable = {0x02, 0x07, 0x08, 0x0A, 0x0B, 0x0E, 0x12}
+
+function test_fullbag ()
+	asm.waitexecute(0x813B) -- cmp gameModeState in @mainLoop
+	asm.jsr(labels.disableNmi)
+	local results = {}
+	for _, orientID in pairs(spawnTable) do
+		results[orientID] = 0
+	end
+	math.randomseed(1)
+	memory.writebyte(labels.spawnID, 0)
+	for i=1,14 do
+		memory.writebyte(labels.rng_seed, math.random(256))
+		asm.jsr(labels.pickRandomTetrimino_7bag)
+		local a = memory.getregister("a")
+		results[a] = results[a] + 1
+	end
+	print(results)
+	for orientID, cnt in pairs(results) do
+		assert(cnt == 2, "orientation: " .. orientID .. " count: " .. cnt)
+	end
+end
+
+function test_distribution ()
+	asm.waitexecute(0x813B) -- cmp gameModeState in @mainLoop
+	asm.jsr(labels.disableNmi)
+	local results = {}
+	for _, orientID in pairs(spawnTable) do
+		results[orientID] = 0
+	end
+	for i=0,255 do
+		memory.writebyte(labels.spawnID, 0x7F)
+		memory.writebyte(labels.rng_seed, i)
+		asm.jsr(labels.pickRandomTetrimino_7bag)
+		local a = memory.getregister("a")
+		results[a] = results[a] + 1
+	end
+	print(results)
+	for orientID, cnt in pairs(results) do
+		assert(cnt == 36 or cnt == 37, "Imbalanced")
+	end
+end
+
+testing.run()

7bag.s

@@ -0,0 +1,62 @@
+;
+; Mod that uses a 7-bag for choosing tetriminos
+;
+
+.include "build/tetris.inc"
+.include "ips.inc"
+
+.segment "PICK_TETRIMINO_PATCH"
+        ips_segment     "PICK_TETRIMINO_PATCH",pickRandomTetrimino,$0038
+
+pickRandomTetrimino_7bag:
+        lda     spawnID
+        bne     @countBits
+        lda     #$7F
+        sta     spawnID
+
+        ; Count number of pieces remaining in bag
+@countBits:
+        ldx     #0
+@shiftLoop:
+        lsr     a
+        bcc     @bitClear
+        inx                     ; Trashes Z, so bne is unconditional
+@bitClear:
+        bne     @shiftLoop
+
+        ; Bounded random
+@mult:  tay                     ; Set y=0
+@multLoop:
+        clc
+        adc     rng_seed
+        bcc     @noCarry
+        iny
+@noCarry:
+        dex
+        bne     @multLoop
+
+        ; Find chosen piece
+        lda     spawnID
+        iny     ; THINGS ARE WEIRD HERE
+@nextBit:
+        inx
+        lsr     a
+        bcc     @nextBit
+        dey
+        bne     @nextBit
+
+        ; Clear chosen piece in spawnID
+        txa
+        tay
+        lda     #$00
+        sec
+@shiftLeft:
+        rol
+        dey
+        bne     @shiftLeft
+        eor     spawnID
+        sta     spawnID
+
+        lda     spawnTable,x
+        rts
+