From 8b716cc5136e2f5365f4c78870df8fcd4c1405b6 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 25 Oct 2024 01:53:08 -0400 Subject: [PATCH] driven: fix bug in dni numbers reusing zero page poorly --- demos/driven/part01_dni/dni.s | 12 +++++----- demos/driven/start.s | 2 +- demos/driven/zp.inc | 41 ++++++++++++++++++++++++----------- 3 files changed, 35 insertions(+), 20 deletions(-) diff --git a/demos/driven/part01_dni/dni.s b/demos/driven/part01_dni/dni.s index 3c56712e..cf90b124 100644 --- a/demos/driven/part01_dni/dni.s +++ b/demos/driven/part01_dni/dni.s @@ -61,7 +61,9 @@ next_scene: sta DRAW_PAGE bit PAGE1 - ldx #$20 ; ??? + ; clears $20-$24 to white for some reason? + + ldx #$20 ; address lda #$FF ; white jsr clear_1k @@ -203,12 +205,10 @@ display_line_loop: lda GBASL sta INL + lda GBASH - clc - adc #$1c ; load from $2000 - -; adc graphics_loc,Y + adc #$1c ; load from $1c00-$2000 sta INH lda GBASH @@ -279,7 +279,7 @@ effect2: lda DRAW_PAGE pha - lda #$1c + lda #$1c ; draw DNI number to $1c sta DRAW_PAGE jsr draw_full_dni_number diff --git a/demos/driven/start.s b/demos/driven/start.s index f13568dc..cefaef29 100644 --- a/demos/driven/start.s +++ b/demos/driven/start.s @@ -182,7 +182,7 @@ load_program_loop: ; restart music - cli ; start interrupts (music) +; cli ; start interrupts (music) ;======================= ;======================= diff --git a/demos/driven/zp.inc b/demos/driven/zp.inc index 5258c457..4a924606 100644 --- a/demos/driven/zp.inc +++ b/demos/driven/zp.inc @@ -138,13 +138,28 @@ MASKH = $ED ; D'NI -SPRITEY = $F2 -SPRITEX = $F3 -SPRITE_XSIZE = $F4 -SIN_COUNT = $F5 -NUMBER_HIGH = $F6 -NUMBER_LOW = $F7 -DRAW_NUMBER = $F8 +SPRITEY = $EE +SPRITEX = $EF +SPRITE_XSIZE = $F0 +SIN_COUNT = $F1 +NUMBER_HIGH = $F2 +NUMBER_LOW = $F3 +DRAW_NUMBER = $FA + +;OUT1 = $F0 +;OUT1H = $F1 +;OUT2 = $F2 +;OUT2H = $F3 +;COMPT1 = $F4 +;COMPT2 = $F5 +;PARAM1 = $F6 +;PARAM2 = $F7 +;PARAM3 = $F8 +;PARAM4 = $F9 +;GRLINE = $FA +;GRLINEH = $FB + + ; Credits BACKUP_OUTL = $F2 @@ -153,18 +168,18 @@ BACKUP_OUTH = $F3 ; PLASMACUBE -OUT1 = $F0 -OUT1H = $F1 -OUT2 = $F2 -OUT2H = $F3 +;OUT1 = $F0 +;OUT1H = $F1 +;OUT2 = $F2 +;OUT2H = $F3 COMPT1 = $F4 COMPT2 = $F5 PARAM1 = $F6 PARAM2 = $F7 PARAM3 = $F8 PARAM4 = $F9 -GRLINE = $FA -GRLINEH = $FB +;GRLINE = $FA +;GRLINEH = $FB ; PLASMA