Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2024-10-12 05:24:02 +00:00
Code Issues Projects Releases Wiki Activity

mockingboard: got compressed version working (mostly)

Browse Source
This commit is contained in:
Vince Weaver 2018-02-05 14:39:03 -05:00
parent 0faa94473b
commit b90eb5877e
6 changed files with 314 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mockingboard/Makefile
View File

@ -3,11 +3,13 @@ include ../Makefile.inc
DOS33 = ../dos33fs-utils/dos33 DOS33 = ../dos33fs-utils/dos33
PNG2GR = ../gr-utils/png2gr PNG2GR = ../gr-utils/png2gr
all: dump_ed mock.dsk all: dump_ed mock.dsk lzss_compress
mock.dsk: KSP_THEME_UNCOMPRESSED KSP_THEME_COMPRESSED mock.dsk: KSP_THEME_UNCOMPRESSED KSP_THEME_COMPRESSED \
KSP_THEME_INTERRUPT
$(DOS33) -y mock_test.dsk BSAVE -a 0x1000 KSP_THEME_UNCOMPRESSED $(DOS33) -y mock_test.dsk BSAVE -a 0x1000 KSP_THEME_UNCOMPRESSED
$(DOS33) -y mock_test.dsk BSAVE -a 0x1000 KSP_THEME_COMPRESSED $(DOS33) -y mock_test.dsk BSAVE -a 0x1000 KSP_THEME_COMPRESSED
$(DOS33) -y mock_test.dsk BSAVE -a 0x1000 KSP_THEME_INTERRUPT
KSP_THEME_COMPRESSED: ksp_theme_compressed.o KSP_THEME_COMPRESSED: ksp_theme_compressed.o
ld65 -o KSP_THEME_COMPRESSED ksp_theme_compressed.o -C ./apple2_1000.inc ld65 -o KSP_THEME_COMPRESSED ksp_theme_compressed.o -C ./apple2_1000.inc
@ -17,6 +19,15 @@ ksp_theme_compressed.o: ksp_theme_compressed.s \
ksp_theme_compressed.inc ksp_theme_compressed.inc
ca65 -o ksp_theme_compressed.o ksp_theme_compressed.s -l ksp_theme_compressed.lst ca65 -o ksp_theme_compressed.o ksp_theme_compressed.s -l ksp_theme_compressed.lst
KSP_THEME_INTERRUPT: ksp_theme_interrupt.o
ld65 -o KSP_THEME_INTERRUPT ksp_theme_interrupt.o -C ./apple2_1000.inc
ksp_theme_interrupt.o: ksp_theme_interrupt.s \
../asm_routines/mockingboard.s \
ksp_title.inc
ca65 -o ksp_theme_interrupt.o ksp_theme_interrupt.s -l ksp_theme_interrupt.lst
KSP_THEME_UNCOMPRESSED: ksp_theme_uncompressed.o KSP_THEME_UNCOMPRESSED: ksp_theme_uncompressed.o
ld65 -o KSP_THEME_UNCOMPRESSED ksp_theme_uncompressed.o -C ./apple2_1000.inc ld65 -o KSP_THEME_UNCOMPRESSED ksp_theme_uncompressed.o -C ./apple2_1000.inc
@ -40,6 +51,12 @@ dump_ed: dump_ed.o notes.o
$(CC) $(LFLAGS) -o dump_ed dump_ed.o notes.o $(CC) $(LFLAGS) -o dump_ed dump_ed.o notes.o
lzss_compress.o: lzss_compress.c
$(CC) $(CFLAGS) -c lzss_compress.c
lzss_compress: lzss_compress.o
$(CC) $(LFLAGS) -o lzss_compress lzss_compress.o
clean: clean:
rm -f *~ TITLE.GR *.o *.lst ED KSP_THEME_UNCOMPRESSED dump_ed rm -f *~ TITLE.GR *.o *.lst ED KSP_THEME_UNCOMPRESSED dump_ed

3
mockingboard/ksp_theme_compressed.inc
View File

@ -7,7 +7,7 @@ ksptheme:
; Author name: Felipe Falanghe ; Author name: Felipe Falanghe
; Comment: Tracked by Vince Weaver ; Comment: Tracked by Vince Weaver
.byte $00,$80,$38,$00 ; 00000 .byte $01,$80,$38,$00 ; 00000
.byte $60,$35,$BD,$EE,$DD,$01,$07,$0D,$0D,$0D ; 00096 .byte $60,$35,$BD,$EE,$DD,$01,$07,$0D,$0D,$0D ; 00096
.byte $01,$00,$07,$0E,$0E,$0E ; 00097 .byte $01,$00,$07,$0E,$0E,$0E ; 00097
.byte $01,$00,$07,$0F,$0F,$0F ; 00098 .byte $01,$00,$07,$0F,$0F,$0F ; 00098
@ -939,5 +939,6 @@ ksptheme:
.byte $01,$00,$01,$09 ; 04035 .byte $01,$00,$01,$09 ; 04035
.byte $08,$00,$01,$08 ; 04043 .byte $08,$00,$01,$08 ; 04043
.byte $01,$01,$00,$01,$00 ; 04044 .byte $01,$01,$00,$01,$00 ; 04044
.byte $ff
; Raw size = 57792 bytes ; Raw size = 57792 bytes
; Updated size = 4800 bytes ; Updated size = 4800 bytes

164
mockingboard/ksp_theme_compressed.s
View File

@ -20,6 +20,27 @@
sta OUTH sta OUTH
jsr move_and_print jsr move_and_print
jsr mockingboard_detect_slot4
cpx #$1
beq mockingboard_found
lda #<not_message
sta OUTL
lda #>not_message
sta OUTH
inc CV
jsr move_and_print
jmp forever_loop
mockingboard_found:
lda #<found_message
sta OUTL
lda #>found_message
sta OUTH
inc CV
jsr move_and_print
;============================ ;============================
; Init the Mockingboard ; Init the Mockingboard
;============================ ;============================
@ -40,8 +61,8 @@
lda #>ksptheme lda #>ksptheme
sta INH sta INH
ldy #0
new_frame: new_frame:
ldy #0
lda (INL),Y ; read in frame delay lda (INL),Y ; read in frame delay
cmp #$ff ; see if end cmp #$ff ; see if end
beq done_play ; if so, done beq done_play ; if so, done
@ -49,90 +70,96 @@ new_frame:
tax tax
old_frame: old_frame:
dex ; decrement the frame diff dex ; decrement the frame diff
bpl delay_a_bit ; if not there yet, delay beq bottom_regs ; if not there yet, delay
jsr delay_50Hz
jmp old_frame
top_regs: bottom_regs:
iny iny
lda (INL),Y ; load low reg bitmask lda (INL),Y ; load low reg bitmask
ldx #$ff sta MASK
top_regs_loop: ldx #$ff ; init to -1
inx bottom_regs_loop:
cmp #$8 inx ; increment X
beq bottom_regs cpx #$8 ; if we reach 8, done
ror beq top_regs ; move on to top
bcc top_regs_loop
stx XX ror MASK
sty YY bcc bottom_regs_loop ; if bit not set in mask, skip reg
iny stx XX ; save X
lda (INL),Y ; read in value
tax
ldy XX iny ; get next output value
lda (INL),Y ; read in value
sty YY ; save Y
tax ; value in X
ldy XX ; register# in Y
; reg in Y, value in X ; reg in Y, value in X
jsr write_ay_left ; assume 3 channel (not six) jsr write_ay_left ; assume 3 channel (not six)
jsr write_ay_right ; so write same to both left/write jsr write_ay_right ; so write same to both left/write
ldx XX ; restore X
ldy YY ; restore Y
jmp bottom_regs_loop ; loop
top_regs:
iny ; point to next value
lda (INL),Y ; load top reg bitmask
sta MASK
ldx #$7 ; load X as 7 (we increment first)
top_regs_loop:
inx ; increment
cpx #$16
beq done_with_masks ; exit if done
ror MASK
bcc top_regs_loop ; loop if not set
stx XX ; save X value
iny ; point to value
lda (INL),Y ; read in output value
sty YY ; save Y value
tax ; value in X
ldy XX ; register in Y
; reg in Y, value in X
jsr write_ay_left ; assume 3 channel (not six)
jsr write_ay_right ; so write same to both left/write
ldx XX ldx XX
ldy YY ldy YY
jmp top_regs_loop jmp top_regs_loop
bottom_regs: done_with_masks:
iny iny
lda (INL),Y ; load low reg bitmask clc
ldx #$ff tya
bottom_regs_loop: adc INL
inx sta INL
cmp #$8 lda #0
beq delay_a_bit adc INH
ror sta INH
bcc bottom_regs_loop
jsr delay_50Hz
stx XX jmp new_frame
sty YY
iny
lda (INL),Y ; read in value
tax
ldy XX
; reg in Y, value in X
jsr write_ay_left ; assume 3 channel (not six)
jsr write_ay_right ; so write same to both left/write
ldx XX
ldy YY
jmp bottom_regs_loop
; reg in Y, value in X
jsr write_ay_left ; assume 3 channel (not six)
jsr write_ay_right ; so write same to both left/write
delay_a_bit:
lda #86
jsr WAIT ; delay 1/2(26+27A+5A^2) us
; 50Hz = 20ms = 20000us
; 40000 = 26+27A+5A^2
; 5a^2+27a-39974 = 0
; A = 86.75
jmp old_frame
done_play: done_play:
jsr clear_ay_left jsr clear_ay_left
jsr clear_ay_right jsr clear_ay_right
lda #0 lda #0
sta CH sta CH
lda #2 lda #3
sta CV sta CV
lda #<done_message lda #<done_message
sta OUTL sta OUTL
@ -144,6 +171,19 @@ done_play:
forever_loop: forever_loop:
jmp forever_loop jmp forever_loop
delay_50Hz:
lda #86
jsr WAIT ; delay 1/2(26+27A+5A^2) us
; 50Hz = 20ms = 20000us
; 40000 = 26+27A+5A^2
; 5a^2+27a-39974 = 0
; A = 86.75
rts
;========= ;=========
;routines ;routines
;========= ;=========
@ -160,4 +200,6 @@ forever_loop:
; strings ; strings
;========= ;=========
mocking_message: .asciiz "ASSUMING MOCKINGBOARD IN SLOT #4" mocking_message: .asciiz "ASSUMING MOCKINGBOARD IN SLOT #4"
not_message: .byte "NOT "
found_message: .asciiz "FOUND"
done_message: .asciiz "DONE PLAYING" done_message: .asciiz "DONE PLAYING"

188
mockingboard/ksp_theme_interrupt.s Normal file
View File

@ -0,0 +1,188 @@
; Play the KSP theme, but compressed a bit (only write registers that change)
; Still 3-channel
; The KSP theme is fairly small, will need to compress more
.include "zp.inc"
;=============================
; Print message
;=============================
jsr HOME
jsr TEXT
lda #0
sta DRAW_PAGE
sta CH
sta CV
lda #<mocking_message
sta OUTL
lda #>mocking_message
sta OUTH
jsr move_and_print
jsr mockingboard_detect_slot4
cpx #$1
beq mockingboard_found
lda #<not_message
sta OUTL
lda #>not_message
sta OUTH
inc CV
jsr move_and_print
jmp forever_loop
mockingboard_found:
lda #<found_message
sta OUTL
lda #>found_message
sta OUTH
inc CV
jsr move_and_print
;============================
; Init the Mockingboard
;============================
jsr mockingboard_init
jsr reset_ay_left
jsr reset_ay_right
jsr clear_ay_left
jsr clear_ay_right
;===========================
; load pointer to the music
;===========================
lda #<ksptheme
sta INL
lda #>ksptheme
sta INH
ldy #0
new_frame:
lda (INL),Y ; read in frame delay
cmp #$ff ; see if end
beq done_play ; if so, done
tax
old_frame:
dex ; decrement the frame diff
bpl delay_a_bit ; if not there yet, delay
top_regs:
iny
lda (INL),Y ; load low reg bitmask
ldx #$ff
top_regs_loop:
inx
cmp #$8
beq bottom_regs
ror
bcc top_regs_loop
stx XX
sty YY
iny
lda (INL),Y ; read in value
tax
ldy XX
; reg in Y, value in X
jsr write_ay_left ; assume 3 channel (not six)
jsr write_ay_right ; so write same to both left/write
ldx XX
ldy YY
jmp top_regs_loop
bottom_regs:
iny
lda (INL),Y ; load low reg bitmask
ldx #$ff
bottom_regs_loop:
inx
cmp #$8
beq delay_a_bit
ror
bcc bottom_regs_loop
stx XX
sty YY
iny
lda (INL),Y ; read in value
tax
ldy XX
; reg in Y, value in X
jsr write_ay_left ; assume 3 channel (not six)
jsr write_ay_right ; so write same to both left/write
ldx XX
ldy YY
jmp bottom_regs_loop
; reg in Y, value in X
jsr write_ay_left ; assume 3 channel (not six)
jsr write_ay_right ; so write same to both left/write
delay_a_bit:
lda #86
jsr WAIT ; delay 1/2(26+27A+5A^2) us
; 50Hz = 20ms = 20000us
; 40000 = 26+27A+5A^2
; 5a^2+27a-39974 = 0
; A = 86.75
jmp old_frame
done_play:
jsr clear_ay_left
jsr clear_ay_right
lda #0
sta CH
lda #2
sta CV
lda #<done_message
sta OUTL
lda #>done_message
sta OUTH
jsr move_and_print
forever_loop:
jmp forever_loop
;=========
;routines
;=========
.include "../asm_routines/gr_offsets.s"
.include "../asm_routines/text_print.s"
.include "../asm_routines/mockingboard.s"
;=======
; music
;=======
.include "ksp_theme_compressed.inc"
;=========
; strings
;=========
mocking_message: .asciiz "LOOKING FOR MOCKINGBOARD IN SLOT #4: "
not_message: .byte "NOT "
found_message: .asciiz "FOUND"
done_message: .asciiz "DONE PLAYING"

BIN
mockingboard/mock_test.dsk
View File

Binary file not shown.

3
mockingboard/zp.inc
View File

@ -100,7 +100,8 @@ KEY_OFFSET EQU $8D
DRAW_BLUE_SKY EQU $8E DRAW_BLUE_SKY EQU $8E
RANDOM_POINTER EQU $8F RANDOM_POINTER EQU $8F
FRAME_COUNT EQU $90 FRAME_COUNT EQU $90
AY_FRAME EQU $91 MB_ADDRL EQU $91
MB_ADDRH EQU $92
SHIPY EQU $E4 SHIPY EQU $E4