merge master

Author: zohassadar

.gitignore

@@ -4,9 +4,15 @@
 *.o
 *.chr
 *.pyc
+*.bin
 tetris.lst
 tetris.lbl
 tetris.map
 tetris.dbg
 release/*
 target
+
+!src/nametables/enter_high_score_nametable.bin
+!src/nametables/game_nametable.bin
+!src/nametables/game_type_menu_nametable.bin
+!src/nametables/level_menu_nametable.bin

src/gamemode/gametypemenu/linecap.asm

@@ -6,22 +6,7 @@ linecapMenuCursorIndices := 3
         jsr updateAudioWaitForNmiAndDisablePpuRendering
         jsr disableNmi
 
-        ; clearNametable
-        lda #$20
-        sta PPUADDR
-        lda #$0
-        sta PPUADDR
-        lda #EMPTY_TILE
-        ldx #4
-        ldy #$BF
-@clearTile:
-        sta PPUDATA
-        dey
-        bne @clearTile
-        sta PPUDATA
-        ldy #$FF
-        dex
-        bne @clearTile
+        jsr clearNametable
 
         jsr bulkCopyToPpu
         .addr linecapMenuNametable

src/gamemode/speedtest.asm

@@ -10,8 +10,9 @@ gameMode_speedTest:
         jsr hzStart
         jsr updateAudioWaitForNmiAndDisablePpuRendering
         jsr disableNmi
-        jsr copyRleNametableToPpu
-        .addr speedtest_nametable
+        jsr clearNametable
+        jsr bulkCopyToPpu
+        .addr speedtest_nametable_patch
         jsr bulkCopyToPpu
         .addr game_palette
         ; patch color

src/modes/tspins.asm

@@ -97,7 +97,8 @@ renderTSpin:
         jsr clearPlayfield
 
         lda tspinY
-        adc #1
+        clc
+        adc #2
         jsr drawFloor
 
         ; get tspin offset

src/nametables.asm

@@ -12,8 +12,6 @@ rocket_nametable: ; RLE
         .incbin "nametables/rocket_nametable.bin"
 legal_nametable: ; RLE
         .incbin "nametables/legal_nametable.bin"
-speedtest_nametable: ; RLE
-        .incbin "nametables/speedtest_nametable.bin"
 title_nametable_patch: ; stripe
         .byte $21, $69, $5, $1D, $12, $1D, $15, $E
         .byte $FF
@@ -22,5 +20,17 @@ rocket_nametable_patch: ; stripe
         .byte $20, $A3, 5, $1c, $1d, $a, $1b, $1d
         .byte $FF
 
+speedtest_nametable_patch:
+        ; tiles
+        .byte $21, $A3, $6, 0, 0, $ED, 0, 0, $EC
+        .byte $22, $23, $3, 'T', 'A', 'P'
+        .byte $22, $A3, $3, 'D', 'I', 'R'
+        .byte $22, $28, $1, 0
+        ; attrs
+        .byte $23, $e2, $1, 0
+        .byte $23, $ea, $1, 0
+        .byte $23, $d8, $43, $55
+        .byte $FF
+
 
 .include "nametables/rle.asm"

src/nametables/build.js

@@ -3,4 +3,3 @@ require('./enter_high_score');
 require('./game_type_menu');
 require('./level_menu');
 require('./rocket_legal');
-require('./speedtest');