From 0f9834dc7a18db023ca9cd46a55f792a9115145a Mon Sep 17 00:00:00 2001
From: Damian Yerrick <pino@pineight.com>
Date: Sun, 10 Mar 2024 16:23:30 -0400
Subject: [PATCH] NES: add Hanover bars test

adapted from "PAL phase" test at
<https://github.com/pinobatch/little-things-nes/tree/master/palphase>

fis #49
---
 .gitignore                  |   2 +
 gba/tilesets/linearity.grit |   1 -
 gba/tilesets/linearity.png  | Bin 1116 -> 0 bytes
 nes/makefile                |   2 +-
 nes/src/global.inc          |   3 +
 nes/src/hanover.s           | 162 ++++++++++++++++++++++++++++++++++++
 nes/src/helppages.txt       |  21 +++++
 nes/src/main.s              |   1 +
 nes/src/rectfiles.s         |  82 ++++++++++++++++++
 9 files changed, 272 insertions(+), 2 deletions(-)
 delete mode 100644 gba/tilesets/linearity.grit
 delete mode 100644 gba/tilesets/linearity.png
 create mode 100644 nes/src/hanover.s

diff --git a/.gitignore b/.gitignore
index ae09ea9..bb41f75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ __pycache__/
 /fc-mdf/obj/fc-mdf/*.s
 /fc-mdf/*.n??.deb
 /fc-mdf/*.dbg
+/fc-mdf/*.fdb
 /fc-mdf/*map.txt
 /fc-mdf/mdfourier-*.nes
 /fc-mdf/mdfourier.prg
@@ -45,6 +46,7 @@ __pycache__/
 /nes/obj/nes/*.sav
 /nes/obj/nes/last-commit*
 /nes/*.dbg
+/nes/*.fdb
 /nes/*map.txt
 /nes/240pee-*rom.nes
 /nes/240pee.nes
diff --git a/gba/tilesets/linearity.grit b/gba/tilesets/linearity.grit
deleted file mode 100644
index b641438..0000000
--- a/gba/tilesets/linearity.grit
+++ /dev/null
@@ -1 +0,0 @@
--p! -gB2 -mRtpf -mLs -mzr
diff --git a/gba/tilesets/linearity.png b/gba/tilesets/linearity.png
deleted file mode 100644
index 264c6a1a509f0b6314393f742911f3dd9f660c16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1116
zcmV-i1f%<jP)<h;3K|Lk000e1NJLTq008g+005{00{{R3qvng70000CP)t-s0001H
zW@fUovj6}8Zn9QV00009a7bBm000ie000ie0hKEb8vp<R2XskIMF-*q6axkf-DwJC
z0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbQzDYzuRA}DqTCtMT
zFc7t!A(@HDl@u3}+C?}hu1H5dftpXCI8vmbVJ4q&1s~u73aVU@;%F}Ug!=>)_Ysg`
zV$O+eY1ft|`7v{31{ayge$SFutKHSEf;0`<U)$h6`9#Rsb)KeQYi@tor0M><1>fC$
zd9k|Yi0*3l?cKBYt6lYpj=x$4LG*(oHu=lX_nfWcqlfHwxFmpZQ&PJ78F@tT<HNIX
zO%NXw^}qj%JR<np<Gl+VARhGAQ0grmAKf1tJ#F0K9sSBXZQuki@&}>z`XQ51R~rby
zzbfv2QXO;A2Un_Vf?pJkk?MHK$&u=s;LFj9vg6yTQeBi?>-ebbrTizZtK_casO(>_
zd}Wx6G5B1k|HVy$@2lszUPQ8vEb<-+UWus?#duanE;NwfW7UX>2315xK*zsR)tC?s
z;#aPL1V2}e!Ew|klW`n3!RxE1Y1GBI37(VdWv%2*@ETU=dS4@NNfa!@YvSn<y{}$}
zl|%5Hyf%}^6|!cxJJ}~U*zwMi+W8JAizfRnIhhT6(nOwGzIok59&<9CDwA$14JCN0
zB<5KzX1YPc#?2ma&B%0NOq<CQwlL_DOq$7kwj{~ojx4VJQB4S*n3dkFnfz$;2%Z?U
zGg}OCL-E9v#x`<H@x+KPY~&Gh61w}4HnL#uNpoB_VIRaz9G&JeZNff$CvmZwv+mnN
zwuCx&Ele2M$qN>Sr~oCllVcVDsnBR{Cl6RCrGm1=PVV!duLuW2hX}YcW8r2Ih(=30
zIm6IEHxGgB)11d1bs@IHG@Ioza3Rml7Rr82J?}g9Fn1vjJZ0e|)q59m&oG5fTddB^
zs61{eW^(*?^48~T+$1C1$kJ;PoF;VOMy^+-mu}?C_Upp50%A9E{P)S1ZsdB=ym2Ex
zZ@-*PGkW7jK5K6aOp5q)Wa&m0?M;|z+5b~yAzjHemhJV=8awGqe*62W$nL|21a_iI
z0xgUaH3pCYgiJ4F^dWcibY2p2?oe0(1vF471qE?X_y`5AP{<4g>(Dj<+n_*OBWP0w
zZ3m%^XuB;iviXL#{Yb(AN_9X<79_m`C6=I+7L-hb(s)v{p4PBLG}NnnQ<qTE6iU}Z
ziDD>44JF5+w0uI|>sb(>WY1EBB<kZ?1cAygP~m4w_bq-UCr0)wc0pw}sK6&#Eag>N
zOqiqdDr$1FS2-0b<U%E6sCW&P&7p!lbW{L3qyQa{zz$|WM?#>(D9|w&=l~9O^anb0
i1RZz64qCN7;`Ij&fp-dT8E@180000<MNUMnLSTYnQ2=-V

diff --git a/nes/makefile b/nes/makefile
index 82af87d..1b5f104 100644
--- a/nes/makefile
+++ b/nes/makefile
@@ -19,7 +19,7 @@ version:=0.23
 objlist:=vwf7 zappertest overclock paldetect vwf_draw init \
   main help helppages.hlp stills stopwatch backlight \
   scrolltest kiki audiosync soundtest crowd mdfourierfe mdfourier \
-  overscan megaton shadowsprite padstest \
+  overscan megaton shadowsprite padstest hanover \
   pads ppuclear unpb53 uniu undte bcd rand rectfill muldiv \
   pb53files rectfiles ntscPeriods
 objlistnsf := mdfouriernsf mdfourier ntscPeriods
diff --git a/nes/src/global.inc b/nes/src/global.inc
index 3017d0d..d9fc74c 100644
--- a/nes/src/global.inc
+++ b/nes/src/global.inc
@@ -86,6 +86,9 @@ GATEDATA_BANK = 1
 SIZEOF_TEST_STATE = 24
 .globalzp test_state
 
+; hanover.s
+.global do_hanover_bars
+
 ; linearity.s
 .global do_new_linearity
 
diff --git a/nes/src/hanover.s b/nes/src/hanover.s
new file mode 100644
index 0000000..a1eedcb
--- /dev/null
+++ b/nes/src/hanover.s
@@ -0,0 +1,162 @@
+.include "nes.inc"
+.include "global.inc"
+.include "rectfill.inc"
+.importzp RF_hanover, helpsect_hanover_bars
+
+hanover_bgcolor = test_state+0
+
+.code
+.proc do_hanover_bars
+  lda #0
+  sta hanover_bgcolor
+restart:
+  lda #$80
+  sta help_reload
+  sta PPUCTRL
+  asl a
+  sta PPUMASK
+  lda #RF_hanover
+  jsr rf_load_layout
+  lda #$3F
+  sta PPUADDR
+  ldx #$01
+  stx PPUADDR
+  palloop:
+    lda hanover_palette-1,x
+    sta PPUDATA
+    inx
+    cpx #hanover_palette_end-hanover_palette+1
+    bcc palloop
+  ldx #0
+  jsr ppu_clear_oam
+
+  ; fill tiles
+  ldx #0
+  stx PPUADDR
+  stx PPUADDR
+  jsr hanover_gentiles
+  ldx #0
+  stx PPUDATA
+  inx
+  jsr hanover_gentiles
+
+  ; generate sprite
+  ldx #0
+  objloop:
+    txa
+    and #%01110000  ; keep row
+    lsr a
+    cmp #24  ; move bottom sprites down 1 line
+    adc #79
+    sta OAM,x
+    inx
+    lda #1
+    sta OAM,x
+    inx
+    lsr a
+    sta OAM,x
+    inx
+    txa
+    and #%00001100  ; keep column
+    asl a
+    adc #48
+    sta OAM,x
+    inx
+    cpx #$60
+    bcc objloop
+
+loop:
+  lda #helpsect_hanover_bars
+  jsr read_pads_helpcheck
+  bcs restart
+
+  ldy hanover_bgcolor
+  lda new_keys
+  lsr a
+  bcc not_right
+    iny
+  not_right:
+  lsr a
+  bcc not_left
+    dey
+  not_left:
+  cpy #13
+  bcc have_new_bgcolor
+  bmi wrap_below_0
+    ldy #0
+    beq have_new_bgcolor
+  wrap_below_0:
+    ldy #13-1
+  have_new_bgcolor:
+  sty hanover_bgcolor
+
+  jsr ppu_wait_vblank
+
+  ; update palette
+  lda #$3F
+  sta PPUADDR
+  lda #$00
+  sta PPUADDR
+  lda hanover_bgcolor
+  beq :+
+    ora #$10
+  :
+  sta PPUDATA
+  ; update nametable
+  lda #$20
+  sta PPUADDR
+  lda #$CD
+  sta PPUADDR
+  lda hanover_bgcolor
+  beq :+
+    lda #2
+  :
+  ora #$20
+  sta PPUDATA
+  lda hanover_bgcolor
+  cmp #1
+  adc #$21
+  sta PPUDATA
+  
+  lda #VBLANK_NMI|BG_0000|OBJ_0000
+  jsr ppu_oam_dma_screen_on_xy0
+  bit new_keys+0
+  bvc loop
+  rts
+.endproc
+
+.proc hanover_gentiles
+xorvalue = $01
+  txa
+  and #$01
+  jsr genplane
+  txa
+  and #$02
+  jsr genplane
+  inx
+  cpx #4
+  bcc hanover_gentiles
+  rts
+genplane:
+  beq :+
+    lda #$FF
+  :
+  sta xorvalue
+  ldy #8
+  byteloop:
+    sta PPUDATA
+    eor xorvalue
+    dey
+    bne byteloop
+  rts
+.endproc
+
+.rodata
+; palette 1: 144,80-240,128
+; palette 2: 48,144-144,192
+; palette 3: 144,144-240-192
+
+hanover_palette:
+  .byte     $20,$12,$13, $00,$14,$15,$16, $00,$17,$18,$19, $00,$1a,$1b,$1c
+  .byte $00,$11
+hanover_palette_end:
diff --git a/nes/src/helppages.txt b/nes/src/helppages.txt
index feff273..ed50d05 100644
--- a/nes/src/helppages.txt
+++ b/nes/src/helppages.txt
@@ -5,6 +5,7 @@ Gradient color bars
 SMPTE color bars
 Color bars on gray
 Color bleed
+Hanover bars
 Monoscope
 Convergence
 Gray ramp
@@ -191,6 +192,26 @@ Select: Show or hide
 
 Concept by Konsolkongen
 
+== Hanover bars ==
+
+Test mixing of colors
+on consecutive lines.
+Many TVs' composite video
+decoders use "comb filtering"
+or "delay line decoding" to
+consider two lines at once,
+which improves luma detail
+and hue in some sources.
+
+The pattern alternates lines
+of dark gray (or a medium
+color) and each medium color.
+If rectangles are solid or
+dots, the TV is applying
+chroma averaging.
+
+←→: Change background color
+
 == Monoscope ==
 
 This pattern contains
diff --git a/nes/src/main.s b/nes/src/main.s
index a52ec10..6b1f3a6 100644
--- a/nes/src/main.s
+++ b/nes/src/main.s
@@ -185,6 +185,7 @@ routines:
   .addr do_smpte-1
   .addr do_601bars-1
   .addr do_color_bleed-1
+  .addr do_hanover_bars-1
   .addr do_monoscope-1
   .addr do_convergence-1
   .addr do_gray_ramp-1
diff --git a/nes/src/rectfiles.s b/nes/src/rectfiles.s
index b20a7a4..df0d029 100644
--- a/nes/src/rectfiles.s
+++ b/nes/src/rectfiles.s
@@ -55,6 +55,7 @@ rectfill_layouts:
 
   rectfile RF_input_mouse, input_mouse_rects, $20, $18
   rectfile RF_safearea_lite, safearea_lite_rects, $20
+  rectfile RF_hanover, hanover_rects, $20, $20
 
 ire_rects:
   rf_rect   0,  0,256,240,$00, 0  ; Clear screen to black
@@ -695,3 +696,84 @@ input_mouse_rects:
   rf_label  32,128, 1, 0
   .byte "Select: Acceleration", 0
   .byte 0
+
+hanover_rects:
+  rf_rect   0,  0,256,240,$00, 0  ; Clear screen
+  rf_rect  80, 80,112,104,$02, 0  ; 12-16 top
+  rf_rect 112, 80,144,104,$03, 0
+  rf_rect 144, 80,176,104,$01, 0
+  rf_rect 176, 80,208,104,$02, 0
+  rf_rect 208, 80,240,104,$03, 0
+  rf_rect  80,104,112,128,$05, 0  ; 12-16 bottom
+  rf_rect 112,104,144,128,$06, 0
+  rf_rect 144,104,176,128,$04, 0
+  rf_rect 176,104,208,128,$05, 0
+  rf_rect 208,104,240,128,$06, 0
+  rf_rect  48,144, 80,168,$01, 0  ; 17-1C top
+  rf_rect  80,144,112,168,$02, 0
+  rf_rect 112,144,144,168,$03, 0
+  rf_rect 144,144,176,168,$01, 0
+  rf_rect 176,144,208,168,$02, 0
+  rf_rect 208,144,240,168,$03, 0
+  rf_rect  48,168, 80,192,$04, 0  ; 17-1C bottom
+  rf_rect  80,168,112,192,$05, 0
+  rf_rect 112,168,144,192,$06, 0
+  rf_rect 144,168,176,192,$04, 0
+  rf_rect 176,168,208,192,$05, 0
+  rf_rect 208,168,240,192,$06, 0
+
+  ; reuse tiles
+  rf_rect  88, 72, 96, 80,$22, 0  ; digit 1
+  rf_rect 120, 72,128, 80,$22, 0  ; digit 1
+  rf_rect 152, 72,160, 80,$22, 0  ; digit 1
+  rf_rect 184, 72,192, 80,$22, 0  ; digit 1
+  rf_rect 216, 72,224, 80,$22, 0  ; digit 1
+  rf_rect  56,136, 64,144,$22, 0  ; digit 1
+  rf_rect  88,136, 96,144,$22, 0  ; digit 1
+  rf_rect 120,136,128,144,$22, 0  ; digit 1
+  rf_rect 152,136,160,144,$22, 0  ; digit 1
+  rf_rect 184,136,192,144,$22, 0  ; digit 1
+  rf_rect 216,136,224,144,$22, 0  ; digit 1
+  rf_rect  16,152, 40,160,$2F, RF_INCR  ; Even 17-1C
+  rf_rect  24,176, 40,184,$32, RF_INCR  ; Odd  17-1C
+  .byte 0
+  rf_attr   0,  0,256,240, 0  ; clear attributes
+  rf_attr 144, 80,240,128, 1  ; 14-16
+  rf_attr  48,144,144,192, 2  ; 14-16
+  rf_attr 144,144,240,192, 3  ; 1a-1c
+  .byte 0
+  rf_label 107, 48, 1, 0
+  .byte "00", 0
+  rf_label  59, 72, 1, 0
+  .byte "11", 0
+  rf_label  96, 72, 1, 0
+  .byte "2", 0
+  rf_label 128, 72, 1, 0
+  .byte "3", 0
+  rf_label 160, 72, 1, 0
+  .byte "4", 0
+  rf_label 192, 72, 1, 0
+  .byte "5", 0
+  rf_label 224, 72, 1, 0
+  .byte "6", 0
+
+  rf_label  64,136, 1, 0
+  .byte "7", 0
+  rf_label  96,136, 1, 0
+  .byte "8", 0
+  rf_label 128,136, 1, 0
+  .byte "9", 0
+  rf_label 160,136, 1, 0
+  .byte "a", 0
+  rf_label 192,136, 1, 0
+  .byte "b", 0
+  rf_label 224,136, 1, 0
+  .byte "c", 0
+
+  rf_label  19, 88, 1, 0
+  .byte "Even", 0
+  rf_label  24,112, 1, 0
+  .byte "Odd", 0
+  rf_label  48, 48, 1, 0
+  .byte "Background:", 0
+  .byte 0