sa: merge sa and ed lyrics files

saved 2k or so

probably not worth the effort
This commit is contained in:
Vince Weaver 2018-06-04 16:46:32 -04:00
parent d1c221da7a
commit 08c92e78dd
7 changed files with 474 additions and 447 deletions

View File

@ -37,6 +37,7 @@ intial 80 col support: 20191
strip out some unneeded text printing: 19962
merge ED and MB code 24993
properly select between versions: 25001
merge the ED and MB lyrics: 22828
Memory Map

View File

@ -75,8 +75,13 @@ lc_sb_ed:
inc LYRICSH
lc_sb_ed2:
; skip MB offset
; adjust pointer 16-bit
inc LYRICSL
bne lc_sb_ed8
inc LYRICSH
lc_sb_ed8:
; beq all_done_lyrics_ed ; if 0, done lyric
all_done_lyrics_ed:
@ -87,7 +92,7 @@ all_done_lyrics_ed:
;========================================================
; display lyrics
; display lyrics mockingboard
;========================================================
display_lyrics:
@ -115,6 +120,13 @@ display_lyrics:
inc LYRICSH
lc_sb2:
; skip ED data
; adjust pointer 16-bit
inc LYRICSL
bne lc_sb5
inc LYRICSH
lc_sb5:
;==================================
; Lyric active, print current char
;==================================

File diff suppressed because it is too large Load Diff

View File

@ -20,10 +20,17 @@ still_alive_ed:
; Setup lyrics
;==============================
lda #<(lyrics_ed)
sta LYRICSL
lda #>(lyrics_ed)
sta LYRICSH
; DANGER! 1 in 256 chance of missing a roll-over
; ED offsets are one after the MB offsets
inc LYRICSL
; lda #<(lyrics_ed)
; sta LYRICSL
; lda #>(lyrics_ed)
; sta LYRICSH
;==================

View File

@ -111,10 +111,10 @@ only_forty:
; Setup lyrics
;==============================
lda #<(lyrics)
sta LYRICSL
lda #>(lyrics)
sta LYRICSH
; lda #<(lyrics)
; sta LYRICSL
; lda #>(lyrics)
; sta LYRICSH
;==================

Binary file not shown.

View File

@ -10,6 +10,15 @@ still_alive:
jsr HOME
jsr TEXT
;=============================
; setup Lyrics
;=============================
lda #<(lyrics)
sta LYRICSL
lda #>(lyrics)
sta LYRICSH
; See if Mockingboard or Electric Duet
lda USEMB
@ -55,9 +64,7 @@ reset:
lyrics:
.include "lyrics.inc"
lyrics_ed:
.include "sa.edlyrics"
art:
.include "ascii_art.inc"
LZ4_BUFFER: