Merge branch 'master' of github.com:kirjavascript/TetrisGYM

Author: kirjavascript

build.js

@@ -166,7 +166,7 @@ if (!fs.existsSync('clean.nes')) {
     const patcher = require('./tools/patch/create');
     const pct = patcher('clean.nes', 'tetris.nes', 'tetris.bps');
     console.timeEnd('patch');
-    console.log(`using ${pct}% of original file`);
+    console.log(`\nusing ${pct}% of original file`);
 }
 
 // stats
@@ -176,7 +176,11 @@ console.log();
 if (fs.existsSync('tetris.map')) {
     const memMap = fs.readFileSync('tetris.map', 'utf8');
 
-    console.log((memMap.match(/PRG_chunk\d+\s+0.+$/gm) || []).join('\n'));
+    false && console.log((memMap.match(/PRG_chunk\d+\s+0.+$/gm) || []).join('\n'));
+
+    const used = parseInt(memMap.match(/PRG_chunk1\s+\w+\s+\w+\s+(\w+)/)?.[1]??'', 16) + 0x100; // 0x100 for reset chunk
+
+    console.log(`${0x8000 - used} PRG bytes free`);
 }
 
 function hashFile(filename) {

src/audio.asm

@@ -269,7 +269,7 @@ handlePausedAudio:  lda audioInitialized
         cmp #$03
         bne LE212
         inc musicPauseSoundEffectCounter
-        ldy #$10
+        ldy #<unknown_sq1_data2
         lda musicPauseSoundEffectCounter
         and #$01
         bne LE20F
@@ -727,7 +727,7 @@ LE51B:  sta DMC_LEN
 ; Unused
 soundEffectSlot3_donk:
         lda #$02
-        ldy #$4C
+        ldy #<soundEffectSlot3_unknown2InitData
         jmp initSoundEffectShared
 
 soundEffectSlot3Playing_advance:

src/data/demo.asm

@@ -6,7 +6,7 @@ branchOnGameMode:
         .addr   gameMode_gameTypeMenu
         .addr   gameMode_levelMenu
         .addr   gameMode_playAndEndingHighScore_jmp
-        .addr   gameMode_playAndEndingHighScore_jmp
+        .addr   gameMode_playAndEndingHighScore_jmp ; use to be demo
         .addr   gameMode_playAndEndingHighScore_jmp ; used to be startDemo
         .addr   gameMode_speedTest
 

src/gamemode/branch.asm

@@ -84,14 +84,8 @@ gameModeState_initGameState:
         sta lineClearStatsByType+2
         sta lineClearStatsByType+3
         sta allegro
-        sta demo_heldButtons
-        sta demo_repeats
-        sta demoIndex
-        sta demoButtonsAddr
         sta holdDownPoints
         sta spawnID
-        lda #>demoButtonsTable
-        sta demoButtonsAddr+1
         lda #$03
         sta renderMode
         ldx #$A0

src/gamemodestate/initstate.asm

@@ -31,6 +31,7 @@ mainLoop:
 @continue:
         jmp mainLoop
 
+.include "audio.asm"
 .include "nmi/nmi.asm"
 .include "nmi/render.asm"
 .include "nmi/pollcontroller.asm"
@@ -80,14 +81,6 @@ mainLoop:
 .include "modes/debug.asm"
 .include "modes/saveslots.asm"
 .include "modes/crash.asm"
-
-.code
-
-.segment    "PRG_chunk2": absolute
-
-.include "data/demo.asm"
-.include "audio.asm"
-
 .include "modes/events.asm"
 .include "modes/controllerinput.asm"
 .include "modes/tapqty.asm"

src/main.asm

@@ -1,102 +1,6 @@
 pollControllerButtons:
-        ; lda gameMode
-        ; cmp #$05
-        ; beq @demoGameMode
-        ; beq @recording
-        jsr pollController
-        rts
-
-@demoGameMode:
-        lda $D0
-        cmp #$FF
-        beq @recording
-        jsr pollController
-        lda newlyPressedButtons_player1
-        cmp #$10
-        beq @startButtonPressed
-        lda demo_repeats
-        beq @finishedMove
-        dec demo_repeats
-        jmp @moveInProgress
-
-@finishedMove:
-        ldx #$00
-        lda (demoButtonsAddr,x)
-        sta generalCounter
-        jsr demoButtonsTable_indexIncr
-        lda demo_heldButtons
-        eor generalCounter
-        and generalCounter
-        sta newlyPressedButtons_player1
-        lda generalCounter
-        sta demo_heldButtons
-        ldx #$00
-        lda (demoButtonsAddr,x)
-        sta demo_repeats
-        jsr demoButtonsTable_indexIncr
-        lda demoButtonsAddr+1
-        cmp #>demoTetriminoTypeTable
-        beq @ret
-        jmp @holdButtons
-
-@moveInProgress:
-        lda #$00
-        sta newlyPressedButtons_player1
-@holdButtons:
-        lda demo_heldButtons
-        sta heldButtons_player1
-@ret:   rts
-
-@startButtonPressed:
-        lda #>demoButtonsTable
-        sta demoButtonsAddr+1
-        lda #$00
-        sta frameCounter+1
-        lda #$01
-        sta gameMode
-        rts
-
-@recording:
-        jsr pollController
-        lda gameMode
-        cmp #$05
-        bne @ret2
-        ; lda $D0
-        ; cmp #$FF
-        bne @ret2
-        lda heldButtons_player1
-        cmp demo_heldButtons
-        beq @buttonsNotChanged
-        ldx #$00
-        lda demo_heldButtons
-        sta (demoButtonsAddr,x)
-        jsr demoButtonsTable_indexIncr
-        lda demo_repeats
-        sta (demoButtonsAddr,x)
-        jsr demoButtonsTable_indexIncr
-        lda demoButtonsAddr+1
-        cmp #>demoTetriminoTypeTable ; check movie has ended
-        beq @ret2
-        lda heldButtons_player1
-        sta demo_heldButtons
-        lda #$00
-        sta demo_repeats
-        rts
-
-@buttonsNotChanged:
-        inc demo_repeats
-
-@ret2:  rts
-
-demoButtonsTable_indexIncr:
-        lda demoButtonsAddr
-        clc
-        adc #$01
-        sta demoButtonsAddr
-        lda #$00
-        adc demoButtonsAddr+1
-        sta demoButtonsAddr+1
-        rts
+        ; demo stuff used to live here
+        jmp pollController
 
 pollController_actualRead:
         ldx joy1Location

src/nmi/pollcontroller.asm

@@ -85,7 +85,7 @@ spriteYOffset: .res 1 ; $00A1
 stringIndexLookup:
 spriteIndexInOamContentLookup: .res 1 ; $00A2
 renderFlags: .res 1 ; $00A3
-; play/demo
+; gameplay
 ; Bit 0-lines 1-level 2-score 3-debug 4-hz 6-stats 7-high score entry letter
 ; speedtest
 ; 0 - hz
@@ -117,7 +117,7 @@ pendingGarbage: .res 1 ; $00BB                    ; Garbage waiting to be delive
 renderMode: .res 1 ; $00BD
     .res 1
 nextPiece: .res 1 ; $00BF                        ; Stored by its orientation ID
-gameMode: .res 1 ; $00C0                        ; 0=legal, 1=title, 2=type menu, 3=level menu, 4=play and ending and high score, 5=demo, 6=start demo
+gameMode: .res 1 ; $00C0                        ; see gamemode/branch.asm
 screenStage: .res 1 ; $00C1                        ; used in gameMode_waitScreen, endingAnimation
 musicType: .res 1 ; $00C2                        ; 0-3; 3 is off
 sleepCounter: .res 1 ; $00C3                    ;
@@ -126,11 +126,7 @@ endingRocketCounter: .res 1 ; $00C6
 endingRocketX: .res 1 ; $C7
 endingRocketY: .res 1 ; $C8
     .res 5
-demo_heldButtons: .res 1 ; $00CE
-demo_repeats: .res 1 ; $00CF
-    .res 1
-demoButtonsAddr: .res 2 ; $00D1                    ; Current address within demoButtonsTable
-demoIndex: .res 1 ; $00D3
+    .res 6 ; used to be demo stuff
 highScoreEntryNameOffsetForLetter: .res 1 ; $00D4   ; Relative to current row
 highScoreEntryRawPos: .res 1 ; $00D5                ; High score position 0=1st type A, 1=2nd... 4=1st type B... 7=4th/extra type B
 highScoreEntryNameOffsetForRow: .res 1 ; $00D6      ; Relative to start of table

src/ram.asm

@@ -13,7 +13,6 @@ SEGMENTS {
     HEADER:   load = HDR, type = ro;
     CHR:      load = CHR, type = ro;
     PRG_chunk1:        load = PRG, type = ro;
-    PRG_chunk2:        load = PRG, type = ro, start = $DD00;
     PRG_chunk3:        load = PRG, type = ro, start = $FF00;
     VECTORS:           load = PRG, type = ro, start = $FFFA;
 }