B now cycles thru all 16 hues; sound ON now followed by normal space, not invers

1 files changed, 28 insertions, 15 deletions

diff --git a/newtitle.s b/newtitle.s
index 75dae91..f2138f4 100644
--- a/newtitle.s
+++ b/newtitle.s
@@ -22,6 +22,8 @@ origin = *
  ; location sound code will look at to see whether sound
  ; is disabled (0 = enabled, !0 = disabled). If you
  ; change this here, change it in sounds.h also!
+ ; in case you're wondering, $03c0 is the start of the printer
+ ; buffer. Taipan doesn't print, so no problem.
 sound_disabled = $03c0
 
  ; since we're changing the font and colors, we'll save the old
@@ -65,9 +67,12 @@ help_size = * - help_rom
  .out .sprintf("help_size == %x", help_size)
  .endif
 
-colorchoices:
- .byte $c0,$10,$00
-colorcount = (*-colorchoices)-1
+; background colors now cycles thru all 16 hues
+;colorchoices:
+ ;.byte $c0,$10,$00
+;colorcount = (*-colorchoices)-1
+default_bg = $c0 ; green
+
 textchoices:
  .byte $08,$0a,$0c,$0e
 textcount = (*-textchoices)-1
@@ -82,7 +87,7 @@ wait:
 
 ; this is needed to prevent the DL from crossing a 1K boundary.
 filler:
- .repeat 3
+ .repeat 5
   .byte $aa
  .endrepeat
 
@@ -166,9 +171,9 @@ sounddisp = help + 78
 start:
 
  .ifdef CART_TARGET
-  lda #$42         ; finish display list. this part has to be in RAM.
-  sta dl_ram
-  lda #<version
+  lda #$42         ; finish display list. this part has to be in RAM,
+  sta dl_ram       ; so we can change the LMS target to show the different
+  lda #<version    ; lines of help.
   sta help_lms
   lda #>version
   sta help_lms+1
@@ -179,6 +184,7 @@ start:
   lda #>dlist
   sta help_lms+4
 
+  ; copy the help text into RAM, where it can be modified.
   ldx #0
 @hsloop:
   lda help_rom,x
@@ -197,7 +203,8 @@ start:
  sta color2save
 
  ; setup color registers
- lda colorchoices
+ ;lda colorchoices
+ lda #default_bg
  sta COLOR2 ; text bg
  lda textchoices
  sta COLOR1 ; text fg
@@ -290,8 +297,8 @@ start:
 
  ; wait for user to press a key
 wait4key:
- lda colorchoices,x
- sta COLOR2
+ ;lda colorchoices,x
+ ;sta COLOR2
  lda textchoices,y
  sta COLOR1
  lda CH
@@ -329,10 +336,16 @@ not_esc:
 not_s:
  cmp #21 ; B key
  bne not_b
- dex
- bpl x_ok
- ldx #colorcount
- bne x_ok
+ lda COLOR2
+ clc
+ adc #$10 ; next hue ($f0 wraps around to $00)
+ sta COLOR2
+ clc
+ bcc x_ok
+ ;dex
+ ;bpl x_ok
+ ;ldx #colorcount
+ ;bne x_ok
 
 not_b:
  cmp #45 ; T key
@@ -373,7 +386,7 @@ enable_disable_sound:
 now_on:
  lda #174 ; inverse N screen code
  sta sounddisp
- lda #128 ; inverse space screen code
+ lda #0   ; space screen code
  sta sounddisp+1
  rts