From fd2d24fa4708878dd53609907391d08cf6176356 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona86@gmail.com>
Date: Tue, 27 Jul 2021 23:22:58 -0700
Subject: [PATCH] hold: Introduce some reasonable graphics

---
 Makefile      |   2 +-
 hold.s        |  30 ++++++++++++++++++++++++++----
 hold_game.nam | Bin 0 -> 1024 bytes
 3 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 hold_game.nam

diff --git a/Makefile b/Makefile
index f15dc5b..a34c764 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ build/highscores.ips: build/highscores.o build/ips.o
 build/highscores.nes: build/tetris.nes
 
 hold: build/hold.nes
-build/hold.o: build/tetris.inc
+build/hold.o: build/tetris.inc build/hold_game.nam.stripe
 build/hold.ips.cfg: build/hold.o
 build/hold.ips: build/hold.o build/ips.o
 build/hold.nes: build/tetris.nes
diff --git a/hold.s b/hold.s
index 5c7696a..508084d 100644
--- a/hold.s
+++ b/hold.s
@@ -4,6 +4,7 @@
 
 .include "ips.inc"
 .include "build/tetris.inc"
+.include "tetris-tbl.inc"
 
 ; $FF for no hold
 savedPiece := $005B
@@ -13,6 +14,11 @@ player1_savedPieceLocked := $007C
 player2_savedPiece := $009B
 player2_savedPieceLocked := $009C
 
+.segment "NAMETABLE"
+        ips_segment     "NAMETABLE",game_nametable,$460
+
+        .incbin "build/hold_game.nam.stripe"
+
 .segment "GAME_INIT"
         ips_segment     "GAME_INIT",$8707
 
@@ -72,7 +78,6 @@ playState_playerControlsActiveTetrimino_mod:
         lda     savedPieceLocked
         bne     @ret
 
-        inc     savedPieceLocked
         lda     #$00
         sta     autorepeatY
         sta     tetriminoY
@@ -87,6 +92,7 @@ playState_playerControlsActiveTetrimino_mod:
         sta     savedPiece
         bmi     @noOldPiece
 
+        inc     savedPieceLocked
         stx     currentPiece
 @ret:
         rts
@@ -110,13 +116,29 @@ stageSpriteForSavedPiece:
         jsr     loadSpriteIntoOamStaging ; from stageSpriteForNextPiece
         lda     #$28
         sta     spriteXOffset
-        lda     #$37
+        lda     #$30
         sta     spriteYOffset
         ldx     savedPiece
-        bmi     @ret
+        bmi     @showHold
         lda     orientationToSpriteTable,x
         sta     spriteIndexInOamContentLookup
         jmp     loadSpriteIntoOamStaging
-@ret:
+
+@showHold:
+        ldx     oamStagingLength
+        ldy     #$00
+@byte:  lda     @holdSprites,y
+        sta     oamStaging,x
+        iny
+        inx
+        cpy     #4*4
+        bne     @byte
+        stx     oamStagingLength
         rts
 
+@holdSprites:
+        set_tbl CHR01+CHR_RIGHT
+        .byte   $34,"H",$03,$20
+        .byte   $34,"O",$03,$28
+        .byte   $34,"L",$03,$30
+        .byte   $34,"D",$03,$38
diff --git a/hold_game.nam b/hold_game.nam
new file mode 100644
index 0000000000000000000000000000000000000000..ea12d1d63ba0f6cded408eb06b98278bd8b6cc02
GIT binary patch
literal 1024
zcmZ`&$!^p@5ak1qk&s47L`H}xcS163(}oGVSjE0CA%T=w0(Kiz?LOIVM*T0j<O4YH
z14#S{NE`#Ad2M?vSx)NEUFz4h*VDu-Q>{L0Vr7(JODeHZOcqa4lQgz^f}+w?TlGa3
zI?D^M8a1}EezJ7pWFx~`A6nvx%EI;bPX)8{&bd(F@Hep)ZoWS^6NG%~bR#3tpPunJ
zXS#kK*@YvGEQ&p)gsjq}^yH#=sZ#tonE1CyvwF_*7CyUo`appANt5-kh1dQI7H{6Z
zd%yAF<BPC`S58Ah`n9z1Nz$x^TRwBve`(>ql}KF~;5TpGMzl6w*1CvU0Ka_YYR7(Q
zDmc_1NTW!&M~|O$?8{sS7!JCA@lu&#D}IG569K>f;NdRzQfH`d<>hYntddx`)iu|#
zKY9#u9MjK*J9qv<C;zJJL$;{z&fR+*d(jIH20e@y__gadI`&o9LrbXt>9gk@`>OvV
zH8wlXhy220?`<O7tJmut`%l>FG1{M^Kee>_2QDO58Z3XawWG3TUpFeJD7K)GA@Y$B
z2&_^GNw50ZbC#<y+#4<ud<4y?(98@qib1<fgN0b`G%M-Fo^}K#vNT!F1onBl;^QPc
h+*@0}ocnh8$L8iw=f2K;-|_zQ`|tMlKj-$<@*n+5N3Q??

literal 0
HcmV?d00001