Apple-2-SW
/
dos33fsprogs
mirror of https://github.com/deater/dos33fsprogs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

music: update all the makefiles in the music directory

This commit is contained in:
Vince Weaver 2021-01-05 18:24:09 -05:00
parent 1ab019969d
commit 3537900858
48 changed files with 309 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/Makefile Normal file
View File

@ -0,0 +1,4 @@
all:
clean:
rm -f *~

30
music/Makefile Normal file
View File

@ -0,0 +1,30 @@
all:
cd bgmusic && make
cd cd && make
cd chiptune_debug && make
cd chiptune_player && make
cd dya && make
cd electric_duet && make
cd megamusic && make
cd ksp_theme && make
cd polly && make
cd pt3_lib && make
cd pt3_player && make
cd sound_effects && make
cd still_alive && make
clean:
cd bgmusic && make clean
cd cd && make clean
cd chiptune_debug && make clean
cd chiptune_player && make clean
cd dya && make clean
cd electric_duet && make clean
cd megamusic && make clean
cd ksp_theme && make clean
cd polly && make clean
cd pt3_lib && make clean
cd pt3_player && make clean
cd sound_effects && make clean
cd still_alive && make clean
rm -f *~

44
music/README Normal file
View File

@ -0,0 +1,44 @@
various utilities/ programs involving Apple II sound/music
+ bgmusic
play music in the background while running basic programs
used in my appleiibot demo
+ cd
a pt3 file ready for a demo
+ chiptune_debug
code trying to debug issues with chiptune player
+ chiptune_player
original ym chiptune player
+ dya
6-channel ym player, for some of DYA's music
+ electric_duet
some experiments with Paul Lutus's electric duet 2-channel
speaker music
+ ksp_theme
some initial tests of various ways to access the mockingboard
plays the Kerbal Space Program theme with some images
+ megamusic
code for playing mockingboard music while in vapor-lock/cycle-count
mode
+ polly
trying to reverse the sound effect code from the Pollywog game
+ pt3_lib
pt3 vortextracker music player library for use in other code
+ pt3_player
pt3 AY-3-8910 vortextracker player for Apple II / 6502
+ sound_effects
some attempts at sound effects
+ still_alive
mockingboard "Still Alive" ending to portal

10
music/bgmusic/Makefile
View File

@ -1,7 +1,7 @@
include ../Makefile.inc
include ../../Makefile.inc
DOS33 = ../dos33fs-utils/dos33
TOKENIZE = ../asoft_basic-utils/tokenize_asoft
DOS33 = ../../utils/dos33fs-utils/dos33
TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
all: bgmusic.dsk
@ -14,12 +14,12 @@ bgmusic.dsk: BGMUSIC HELLO
###
HELLO: hello.bas
../asoft_basic-utils/tokenize_asoft < hello.bas > HELLO
$(TOKENIZE) < hello.bas > HELLO
###
BGMUSIC: bgmusic.o
ld65 -o BGMUSIC bgmusic.o -C ../linker_scripts/apple2_6000.inc
ld65 -o BGMUSIC bgmusic.o -C ../../linker_scripts/apple2_6000.inc
bgmusic.o: bgmusic.s \
zp.inc hardware.inc nozp.inc

5
music/cd/Makefile Normal file
View File

@ -0,0 +1,5 @@
all:
clean:
rm -f *~

24
music/chiptune_debug/Makefile
View File

@ -1,7 +1,7 @@
include ../Makefile.inc
include ../../Makefile.inc
DOS33 = ../dos33fs-utils/dos33
PNG2GR = ../gr-utils/png2gr
DOS33 = ../../utils/dos33fs-utils/dos33
PNG2GR = ../../utils/gr-utils/png2gr
all: chiptune_debug.dsk
@ -22,7 +22,7 @@ chiptune_debug.dsk: CHIPTUNE_IRQ CHIPTUNE_NOIRQ CHIPTUNE_25HZ \
CHIPTUNE_IRQ: chiptune_irq.o
ld65 -o CHIPTUNE_IRQ chiptune_irq.o -C ../linker_scripts/apple2_c00.inc
ld65 -o CHIPTUNE_IRQ chiptune_irq.o -C ../../linker_scripts/apple2_c00.inc
chiptune_irq.o: chiptune_player.s \
mockingboard_a.s \
@ -31,7 +31,7 @@ chiptune_irq.o: chiptune_player.s \
ca65 -o chiptune_irq.o chiptune_player.s -l chiptune_irq.lst
CHIPTUNE_NOIRQ: chiptune_noirq.o
ld65 -o CHIPTUNE_NOIRQ chiptune_noirq.o -C ../linker_scripts/apple2_c00.inc
ld65 -o CHIPTUNE_NOIRQ chiptune_noirq.o -C ../../linker_scripts/apple2_c00.inc
chiptune_noirq.o: chiptune_player.s \
mockingboard_a.s \
@ -40,7 +40,7 @@ chiptune_noirq.o: chiptune_player.s \
ca65 -D NOIRQ=1 -o chiptune_noirq.o chiptune_player.s -l chiptune_noirq.lst
CHIPTUNE_25HZ: chiptune_25Hz.o
ld65 -o CHIPTUNE_25HZ chiptune_25Hz.o -C ../linker_scripts/apple2_c00.inc
ld65 -o CHIPTUNE_25HZ chiptune_25Hz.o -C ../../linker_scripts/apple2_c00.inc
chiptune_25Hz.o: chiptune_player.s \
mockingboard_a.s \
@ -50,31 +50,31 @@ chiptune_25Hz.o: chiptune_player.s \
CHIPTUNE_BARE: chiptune_bare.o
ld65 -o CHIPTUNE_BARE chiptune_bare.o -C ../linker_scripts/apple2_c00.inc
ld65 -o CHIPTUNE_BARE chiptune_bare.o -C ../../linker_scripts/apple2_c00.inc
chiptune_bare.o: chiptune_bare.s
ca65 -o chiptune_bare.o chiptune_bare.s -l chiptune_bare.lst
CHIPTUNE_MIN: chiptune_min.o
ld65 -o CHIPTUNE_MIN chiptune_min.o -C ../linker_scripts/apple2_c00.inc
ld65 -o CHIPTUNE_MIN chiptune_min.o -C ../../linker_scripts/apple2_c00.inc
chiptune_min.o: chiptune_min.s
ca65 -o chiptune_min.o chiptune_min.s -l chiptune_min.lst
CHIPTUNE_TINY: chiptune_tiny.o
ld65 -o CHIPTUNE_TINY chiptune_tiny.o -C ../linker_scripts/apple2_c00.inc
ld65 -o CHIPTUNE_TINY chiptune_tiny.o -C ../../linker_scripts/apple2_c00.inc
chiptune_tiny.o: chiptune_tiny.s
ca65 -o chiptune_tiny.o chiptune_tiny.s -l chiptune_tiny.lst
CHIPTUNE_RIGHT: chiptune_right.o
ld65 -o CHIPTUNE_RIGHT chiptune_right.o -C ../linker_scripts/apple2_c00.inc
ld65 -o CHIPTUNE_RIGHT chiptune_right.o -C ../../linker_scripts/apple2_c00.inc
chiptune_right.o: chiptune_right.s
ca65 -o chiptune_right.o chiptune_right.s -l chiptune_right.lst
CHIPTUNE_SMALLEST: chiptune_smallest.o
ld65 -o CHIPTUNE_SMALLEST chiptune_smallest.o -C ../linker_scripts/apple2_c00.inc
ld65 -o CHIPTUNE_SMALLEST chiptune_smallest.o -C ../../linker_scripts/apple2_c00.inc
chiptune_smallest.o: chiptune_smallest.s
ca65 -o chiptune_smallest.o chiptune_smallest.s -l chiptune_smallest.lst
@ -82,7 +82,7 @@ chiptune_smallest.o: chiptune_smallest.s
CHIPTUNE_READBACK: chiptune_readback.o
ld65 -o CHIPTUNE_READBACK chiptune_readback.o -C ../linker_scripts/apple2_c00.inc
ld65 -o CHIPTUNE_READBACK chiptune_readback.o -C ../../linker_scripts/apple2_c00.inc
chiptune_readback.o: chiptune_readback.s
ca65 -o chiptune_readback.o chiptune_readback.s -l chiptune_readback.lst

31
music/chiptune_player/Makefile
View File

@ -1,12 +1,13 @@
include ../Makefile.inc
include ../../Makefile.inc
DOS33 = ../dos33fs-utils/dos33
PNG2GR = ../gr-utils/png2gr
DOS33 = ../../utils/dos33fs-utils/dos33
PNG2GR = ../../utils/gr-utils/png2gr
TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
all: chiptune_player.dsk chiptune_unrolled.dsk
$(DOS33):
cd ../dos33fs-utils && make
cd ../../utils/dos33fs-utils && make
chiptune_player.dsk: CHIPTUNE_PLAYER ./krw/INTRO2.KRW HELLO
cp chiptune_empty.dsk chiptune_player.dsk
@ -55,29 +56,29 @@ chiptune_unrolled.dsk: CHIPTUNE_UNROLLED ./krw/INTRO2.KRW
# $(DOS33) -y chiptune_unrolled.dsk BSAVE -a 0x1c00 ./krw/WAVE.KRW
HELLO: hello.bas
../asoft_basic-utils/tokenize_asoft < hello.bas > HELLO
$(TOKENIZE) < hello.bas > HELLO
CHIPTUNE_PLAYER: chiptune_player.o
ld65 -o CHIPTUNE_PLAYER chiptune_player.o -C ../linker_scripts/apple2_800.inc
ld65 -o CHIPTUNE_PLAYER chiptune_player.o -C ../../linker_scripts/apple2_800.inc
chiptune_player.o: chiptune_player.s \
../asm_routines/mockingboard.s \
../asm_routines/dos33_routines.s \
../asm_routines/lz4_decode.s \
../asm_routines/keypress_minimal.s \
../../asm_routines/mockingboard.s \
../../asm_routines/dos33_routines.s \
../../asm_routines/lz4_decode.s \
../../asm_routines/keypress_minimal.s \
qkumba_rts.s \
rasterbars.s volume_bars.s interrupt_handler.s \
song_list.inc chip_title.inc zp.inc chip_title_uncompressed.inc
ca65 -o chiptune_player.o chiptune_player.s -l chiptune_player.lst
CHIPTUNE_UNROLLED: chiptune_unrolled.o
ld65 -o CHIPTUNE_UNROLLED chiptune_unrolled.o -C ../linker_scripts/apple2_800.inc
ld65 -o CHIPTUNE_UNROLLED chiptune_unrolled.o -C ../../linker_scripts/apple2_800.inc
chiptune_unrolled.o: chiptune_player.s \
../asm_routines/mockingboard.s \
../asm_routines/dos33_routines.s \
../asm_routines/lz4_decode.s \
../asm_routines/keypress_minimal.s \
../../asm_routines/mockingboard.s \
../../asm_routines/dos33_routines.s \
../../asm_routines/lz4_decode.s \
../../asm_routines/keypress_minimal.s \
rasterbars.s volume_bars.s interrupt_handler_unrolled.s \
chip_title.inc zp.inc
ca65 -D UNROLLED=1 -o chiptune_unrolled.o chiptune_player.s -l chiptune_unrolled.lst

18
music/chiptune_player/chiptune_player.s
View File

@ -611,17 +611,17 @@ krw_file:
;=========
;routines
;=========
.include "../asm_routines/gr_offsets.s"
.include "../../asm_routines/gr_offsets.s"
.include "text_print.s"
.include "../asm_routines/mockingboard_a.s"
.include "../asm_routines/gr_fast_clear.s"
.include "../asm_routines/pageflip.s"
;.include "../asm_routines/gr_unrle.s"
.include "../asm_routines/gr_setpage.s"
.include "../../asm_routines/mockingboard_a.s"
.include "../../asm_routines/gr_fast_clear.s"
.include "../../asm_routines/pageflip.s"
;.include "../../asm_routines/gr_unrle.s"
.include "../../asm_routines/gr_setpage.s"
.include "qkumba_rts.s"
.include "../asm_routines/gr_hlin.s"
.include "../asm_routines/lz4_decode.s"
.include "../asm_routines/keypress_minimal.s"
.include "../../asm_routines/gr_hlin.s"
.include "../../asm_routines/lz4_decode.s"
.include "../../asm_routines/keypress_minimal.s"
.include "rasterbars.s"
.include "volume_bars.s"
.if .def(UNROLLED)

23
music/dya/Makefile
View File

@ -1,7 +1,8 @@
include ../Makefile.inc
include ../../Makefile.inc
DOS33 = ../dos33fs-utils/dos33
PNG2GR = ../gr-utils/png2gr
DOS33 = ../../utils/dos33fs-utils/dos33
PNG2GR = ../../utils/gr-utils/png2gr
TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
all: chiptune_dya.dsk
@ -16,27 +17,27 @@ chiptune_dya.dsk: CHIPTUNE_PLAYER HELLO
$(DOS33) -y chiptune_dya.dsk BSAVE -a 0xd100 DOTD2.KRW
HELLO: hello.bas
../asoft_basic-utils/tokenize_asoft < hello.bas > HELLO
$(TOKENIZE) < hello.bas > HELLO
CHIPTUNE_PLAYER: chiptune_player.o
ld65 -o CHIPTUNE_PLAYER chiptune_player.o -C ../linker_scripts/apple2_800.inc
ld65 -o CHIPTUNE_PLAYER chiptune_player.o -C apple2_800.inc
chiptune_player.o: chiptune_player.s \
mockingboard_a.s \
lz4_decode.s \
../asm_routines/keypress_minimal.s \
../../asm_routines/keypress_minimal.s \
rasterbars.s volume_bars.s interrupt_handler.s qkumba_rts.s \
chip_title_uncompressed.inc zp.inc
ca65 -o chiptune_player.o chiptune_player.s -l chiptune_player.lst
CHIPTUNE_UNROLLED: chiptune_unrolled.o
ld65 -o CHIPTUNE_UNROLLED chiptune_unrolled.o -C ../linker_scripts/apple2_c00.inc
ld65 -o CHIPTUNE_UNROLLED chiptune_unrolled.o -C ../../linker_scripts/apple2_c00.inc
chiptune_unrolled.o: chiptune_player.s \
../asm_routines/mockingboard.s \
../asm_routines/dos33_routines.s \
../asm_routines/lz4_decode.s \
../asm_routines/keypress_minimal.s \
../../asm_routines/mockingboard.s \
../../asm_routines/dos33_routines.s \
../../asm_routines/lz4_decode.s \
../../asm_routines/keypress_minimal.s \
rasterbars.s volume_bars.s interrupt_handler_unrolled.s \
chip_title.inc zp.inc
ca65 -D UNROLLED=1 -o chiptune_unrolled.o chiptune_player.s -l chiptune_unrolled.lst

2
music/dya/README
View File

@ -19,6 +19,8 @@ Hacks:
hard-coded to jump into the $F000 range. IIe/IIc might
be smart enough to handle this, but older machines are not.
so be sure to have your emulator in iie-enhanced mode (not just iie)
Hack: copy the FXXX range into the language card so it doesn't
matter?

12
music/dya/apple2_800.inc Normal file
View File

@ -0,0 +1,12 @@
MEMORY {
ZP: start = $00, size = $1A, type = rw;
RAM: start = $800, size = $8E00, file = %O;
}
SEGMENTS {
CODE: load = RAM, type = ro, align = $400;
RODATA: load = RAM, type = ro;
DATA: load = RAM, type = rw;
BSS: load = RAM, type = bss, define = yes;
ZEROPAGE: load = ZP, type = zp;
}

12
music/dya/chiptune_player.s
View File

@ -738,17 +738,17 @@ krw_file:
;=========
;routines
;=========
.include "../asm_routines/gr_offsets.s"
.include "../../asm_routines/gr_offsets.s"
.include "text_print.s"
.include "mockingboard_a.s"
.include "../asm_routines/gr_fast_clear.s"
.include "../asm_routines/pageflip.s"
;.include "../asm_routines/gr_unrle.s"
.include "../../asm_routines/gr_fast_clear.s"
.include "../../asm_routines/pageflip.s"
;.include "../../asm_routines/gr_unrle.s"
.include "gr_setpage.s"
.include "qkumba_rts.s"
.include "../asm_routines/gr_hlin.s"
.include "../../asm_routines/gr_hlin.s"
.include "lz4_decode.s"
.include "../asm_routines/keypress_minimal.s"
.include "../../asm_routines/keypress_minimal.s"
.include "rasterbars.s"
.include "volume_bars.s"
.if .def(UNROLLED)

8
music/electric_duet/Makefile
View File

@ -1,11 +1,11 @@
include ../Makefile.inc
include ../../Makefile.inc
DOS33 = ../dos33fs-utils/dos33
DOS33 = ../../utils/dos33fs-utils/dos33
all: eduet.dsk
$(DOS33):
cd ../dos33fs-utils && make
cd ../../utils/dos33fs-utils && make
eduet.dsk: $(DOS33) ED HIGHWIND.ED FIGHTING.ED SA.ED KERBAL.ED KORO.ED
$(DOS33) -y eduet.dsk BSAVE -a 0x0C00 ED
@ -16,7 +16,7 @@ eduet.dsk: $(DOS33) ED HIGHWIND.ED FIGHTING.ED SA.ED KERBAL.ED KORO.ED
$(DOS33) -y eduet.dsk BSAVE -a 0x2000 KORO.ED
ED: duet.o
ld65 -o ED duet.o -C ../linker_scripts/apple2_c00.inc
ld65 -o ED duet.o -C ../../linker_scripts/apple2_c00.inc
duet.o: duet.s
ca65 -o duet.o duet.s -l duet.lst

32
music/mockingboard/Makefile → music/ksp_theme/Makefile
View File

@ -1,7 +1,7 @@
include ../Makefile.inc
include ../../Makefile.inc
DOS33 = ../dos33fs-utils/dos33
PNG2GR = ../gr-utils/png2gr
DOS33 = ../../utils/dos33fs-utils/dos33
PNG2GR = ../../utils/gr-utils/png2gr
all: dump_ed mock_test.dsk lzss_compress
@ -15,46 +15,46 @@ mock_test.dsk: KSP_THEME_UNCOMPRESSED KSP_THEME_COMPRESSED \
KSP_THEME_COMPRESSED: ksp_theme_compressed.o
ld65 -o KSP_THEME_COMPRESSED ksp_theme_compressed.o -C ../linker_scripts/apple2_1000.inc
ld65 -o KSP_THEME_COMPRESSED ksp_theme_compressed.o -C ../../linker_scripts/apple2_1000.inc
ksp_theme_compressed.o: ksp_theme_compressed.s \
../asm_routines/mockingboard.s \
../../asm_routines/mockingboard.s \
ksp_theme_compressed.inc
ca65 -o ksp_theme_compressed.o ksp_theme_compressed.s -l ksp_theme_compressed.lst
KSP_THEME_6CH: ksp_theme_6ch.o
ld65 -o KSP_THEME_6CH ksp_theme_6ch.o -C ../linker_scripts/apple2_4000.inc
ld65 -o KSP_THEME_6CH ksp_theme_6ch.o -C ../../linker_scripts/apple2_4000.inc
ksp_theme_6ch.o: ksp_theme_6ch.s \
../asm_routines/mockingboard.s \
../asm_routines/lzss_decompress.s \
../../asm_routines/mockingboard.s \
../../asm_routines/lzss_decompress.s \
ksp_theme_compressed.inc ksp_theme2_compressed.inc \
ksp_title.inc
ca65 -o ksp_theme_6ch.o ksp_theme_6ch.s -l ksp_theme_6ch.lst
KSP_THEME_INTERRUPT: ksp_theme_interrupt.o
ld65 -o KSP_THEME_INTERRUPT ksp_theme_interrupt.o -C ../linker_scripts/apple2_4000.inc
ld65 -o KSP_THEME_INTERRUPT ksp_theme_interrupt.o -C ../../linker_scripts/apple2_4000.inc
ksp_theme_interrupt.o: ksp_theme_interrupt.s \
../asm_routines/mockingboard.s \
../asm_routines/lzss_decompress.s \
../../asm_routines/mockingboard.s \
../../asm_routines/lzss_decompress.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
ld65 -o KSP_THEME_UNCOMPRESSED ksp_theme_uncompressed.o -C ../linker_scripts/apple2_1000.inc
ld65 -o KSP_THEME_UNCOMPRESSED ksp_theme_uncompressed.o -C ../../linker_scripts/apple2_1000.inc
ksp_theme_uncompressed.o: ksp_theme_uncompressed.s \
../asm_routines/mockingboard.s
../../asm_routines/mockingboard.s
ca65 -o ksp_theme_uncompressed.o ksp_theme_uncompressed.s -l ksp_theme_uncompressed.lst
INTERRUPT_TEST: interrupt_test.o
ld65 -o INTERRUPT_TEST interrupt_test.o -C ../linker_scripts/apple2_1000.inc
ld65 -o INTERRUPT_TEST interrupt_test.o -C ../../linker_scripts/apple2_1000.inc
interrupt_test.o: interrupt_test.s \
../asm_routines/mockingboard.s
../../asm_routines/mockingboard.s
ca65 -o interrupt_test.o interrupt_test.s -l interrupt_test.lst
@ -85,5 +85,5 @@ clean:
rm -f *~ TITLE.GR *.o *.lst ED KSP_THEME_UNCOMPRESSED \
KSP_THEME_COMPRESSED KSP_THEME_INTERRUPT \
KSP_THEME_6CH INTERRUPT_TEST dump_ed \
CHIPTUNE_PLAYER
CHIPTUNE_PLAYER lzss_compress

5
music/ksp_theme/README Normal file
View File

@ -0,0 +1,5 @@
Some code from when I was first figuring out how to use the Mockingboard card.
A lot of the tests are the Kerbal Space Program theme

0
music/mockingboard/YM5_COMPRESSION → music/ksp_theme/YM5_COMPRESSION
View File

0
music/mockingboard/dump_ed.c → music/ksp_theme/dump_ed.c
View File

6
music/mockingboard/interrupt_test.s → music/ksp_theme/interrupt_test.s
View File

@ -118,9 +118,9 @@ interrupt_handler:
;=========
;routines
;=========
.include "../asm_routines/gr_offsets.s"
.include "../asm_routines/text_print.s"
.include "../asm_routines/mockingboard.s"
.include "../../asm_routines/gr_offsets.s"
.include "../../asm_routines/text_print.s"
.include "../../asm_routines/mockingboard.s"
;=========
; strings

0
music/mockingboard/ksp_loading.inc → music/ksp_theme/ksp_loading.inc
View File

0
music/mockingboard/ksp_squad.inc → music/ksp_theme/ksp_squad.inc
View File

0
music/mockingboard/ksp_theme2_compressed.inc → music/ksp_theme/ksp_theme2_compressed.inc
View File

0
music/mockingboard/ksp_theme3_compressed.inc → music/ksp_theme/ksp_theme3_compressed.inc
View File

10
music/mockingboard/ksp_theme_6ch.s → music/ksp_theme/ksp_theme_6ch.s
View File

@ -567,11 +567,11 @@ done_interrupt:
;=========
;routines
;=========
.include "../asm_routines/gr_offsets.s"
.include "../asm_routines/text_print.s"
.include "../asm_routines/mockingboard.s"
.include "../asm_routines/lzss_decompress.s"
.include "../asm_routines/gr_fast_clear.s"
.include "../../asm_routines/gr_offsets.s"
.include "../../asm_routines/text_print.s"
.include "../../asm_routines/mockingboard.s"
.include "../../asm_routines/lzss_decompress.s"
.include "../../asm_routines/gr_fast_clear.s"
;=======
; music

0
music/mockingboard/ksp_theme_compressed.inc → music/ksp_theme/ksp_theme_compressed.inc
View File

6
music/mockingboard/ksp_theme_compressed.s → music/ksp_theme/ksp_theme_compressed.s
View File

@ -187,9 +187,9 @@ delay_50Hz:
;=========
;routines
;=========
.include "../asm_routines/gr_offsets.s"
.include "../asm_routines/text_print.s"
.include "../asm_routines/mockingboard.s"
.include "../../asm_routines/gr_offsets.s"
.include "../../asm_routines/text_print.s"
.include "../../asm_routines/mockingboard.s"
;=======
; music

10
music/mockingboard/ksp_theme_interrupt.s → music/ksp_theme/ksp_theme_interrupt.s
View File

@ -457,11 +457,11 @@ done_interrupt:
;=========
;routines
;=========
.include "../asm_routines/gr_offsets.s"
.include "../asm_routines/text_print.s"
.include "../asm_routines/mockingboard.s"
.include "../asm_routines/lzss_decompress.s"
.include "../asm_routines/gr_fast_clear.s"
.include "../../asm_routines/gr_offsets.s"
.include "../../asm_routines/text_print.s"
.include "../../asm_routines/mockingboard.s"
.include "../../asm_routines/lzss_decompress.s"
.include "../../asm_routines/gr_fast_clear.s"
;=======
; music

6
music/mockingboard/ksp_theme_uncompressed.s → music/ksp_theme/ksp_theme_uncompressed.s
View File

@ -113,9 +113,9 @@ forever_loop:
;=========
;routines
;=========
.include "../asm_routines/gr_offsets.s"
.include "../asm_routines/text_print.s"
.include "../asm_routines/mockingboard.s"
.include "../../asm_routines/gr_offsets.s"
.include "../../asm_routines/text_print.s"
.include "../../asm_routines/mockingboard.s"
;=======
; music

0
music/mockingboard/ksp_title.inc → music/ksp_theme/ksp_title.inc
View File

0
music/mockingboard/ksptheme_uncompressed.inc → music/ksp_theme/ksptheme_uncompressed.inc
View File

0
music/mockingboard/lzss_compress.c → music/ksp_theme/lzss_compress.c
View File

0
music/mockingboard/mock_test.dsk → music/ksp_theme/mock_test.dsk
View File

0
music/mockingboard/notes.c → music/ksp_theme/notes.c
View File

0
music/mockingboard/notes.h → music/ksp_theme/notes.h
View File

0
music/mockingboard/zp.inc → music/ksp_theme/zp.inc
View File

22
music/megamusic/Makefile
View File

@ -1,9 +1,9 @@
include ../Makefile.inc
include ../../Makefile.inc
DOS33 = ../dos33fs-utils/dos33
B2D = ../bmp2dhr/b2d
PNG_TO_40x96 = ../gr-utils/png_to_40x96
PNG_TO_RLE = ../gr-utils/png2rle
DOS33 = ../../utils/dos33fs-utils/dos33
B2D = ../../utils/bmp2dhr/b2d
PNG_TO_40x96 = ../../utils/gr-utils/png_to_40x96
PNG_TO_RLE = ../../utils/gr-utils/png2rle
all: megamusic.dsk
@ -19,7 +19,7 @@ megamusic.dsk: MEGAMUSIC MEGALOAD HALFMUSIC MUSIC.D000X2 MUSIC.D000 MUSIC.1000
####
MUSIC.1000: music_1000.o
ld65 -o MUSIC.1000 music_1000.o -C ../linker_scripts/apple2_1000.inc
ld65 -o MUSIC.1000 music_1000.o -C ../../linker_scripts/apple2_1000.inc
music_1000.o: music_1000.s
ca65 -o music_1000.o music_1000.s -l music_1000.lst
@ -27,7 +27,7 @@ music_1000.o: music_1000.s
####
MUSIC.D000: music_d000.o
ld65 -o MUSIC.D000 music_d000.o -C ../linker_scripts/apple2_d000.inc
ld65 -o MUSIC.D000 music_d000.o -C ../../linker_scripts/apple2_d000.inc
music_d000.o: music_d000.s
ca65 -o music_d000.o music_d000.s
@ -35,7 +35,7 @@ music_d000.o: music_d000.s
####
MUSIC.D000X2: music_2nd_d000.o
ld65 -o MUSIC.D000X2 music_2nd_d000.o -C ../linker_scripts/apple2_d000.inc
ld65 -o MUSIC.D000X2 music_2nd_d000.o -C ../../linker_scripts/apple2_d000.inc
music_2nd_d000.o: music_2nd_d000.s
ca65 -o music_2nd_d000.o music_2nd_d000.s
@ -43,7 +43,7 @@ music_2nd_d000.o: music_2nd_d000.s
####
MEGAMUSIC: megamusic.o
ld65 -o MEGAMUSIC megamusic.o -C ../linker_scripts/apple2_4000.inc
ld65 -o MEGAMUSIC megamusic.o -C ../../linker_scripts/apple2_4000.inc
megamusic.o: megamusic.s \
play_music.s falling_apple.s
@ -52,7 +52,7 @@ megamusic.o: megamusic.s \
####
HALFMUSIC: halfmusic.o
ld65 -o HALFMUSIC halfmusic.o -C ../linker_scripts/apple2_4000.inc
ld65 -o HALFMUSIC halfmusic.o -C ../../linker_scripts/apple2_4000.inc
halfmusic.o: halfmusic.s \
play_half.s falling_half.s
@ -62,7 +62,7 @@ halfmusic.o: halfmusic.s \
####
MEGALOAD: megaload.o
ld65 -o MEGALOAD megaload.o -C ../linker_scripts/apple2_800.inc
ld65 -o MEGALOAD megaload.o -C ../../linker_scripts/apple2_800.inc
megaload.o: megaload.s
ca65 -o megaload.o megaload.s -l megaload.lst

4
music/megamusic/README Normal file
View File

@ -0,0 +1,4 @@
sample code for playing mockingboard music while doing vapor-lock/cycle-counting
used in the demosplash2019 lores-escape demo

19
music/polly/Makefile
View File

@ -1,10 +1,11 @@
include ../Makefile.inc
include ../../Makefile.inc
DOS33 = ../dos33fs-utils/dos33
PNG_TO_40x96 = ../gr-utils/png_to_40x96
PNG_TO_40x48D = ../gr-utils/png_to_40x48d
PNG2RLE = ../gr-utils/png2rle
B2D = ../bmp2dhr/b2d
DOS33 = ../../utils/dos33fs-utils/dos33
PNG_TO_40x96 = ../../utils/gr-utils/png_to_40x96
PNG_TO_40x48D = ../../utils/gr-utils/png_to_40x48d
PNG2RLE = ../../utils/gr-utils/png2rle
B2D = ../../utils/bmp2dhr/b2d
TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
all: polly.dsk
@ -19,7 +20,7 @@ polly.dsk: HELLO POLLY BOOP
BOOP: boop.o
ld65 -o BOOP boop.o -C ../linker_scripts/apple2_1000.inc
ld65 -o BOOP boop.o -C ../../linker_scripts/apple2_1000.inc
boop.o: boop.s
ca65 -o boop.o boop.s -l boop.lst
@ -27,7 +28,7 @@ boop.o: boop.s
###
POLLY: polly.o
ld65 -o POLLY polly.o -C ../linker_scripts/apple2_1000.inc
ld65 -o POLLY polly.o -C ../../linker_scripts/apple2_1000.inc
polly.o: polly.s
ca65 -o polly.o polly.s -l polly.lst
@ -36,7 +37,7 @@ polly.o: polly.s
HELLO: hello.bas
../asoft_basic-utils/tokenize_asoft < hello.bas > HELLO
$(TOKENIZE) < hello.bas > HELLO
####

13
music/pt3_lib/Makefile
View File

@ -1,12 +1,13 @@
include ../Makefile.inc
include ../../Makefile.inc
DOS33 = ../dos33fs-utils/dos33
PNG2GR = ../gr-utils/png2gr
DOS33 = ../../utils/dos33fs-utils/dos33
PNG2GR = ../../utils/gr-utils/png2gr
TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
all: pt3_lib.dsk
$(DOS33):
cd ../dos33fs-utils && make
cd ../../utils/dos33fs-utils && make
pt3_lib.dsk: PT3_TEST HELLO
cp empty.dsk pt3_lib.dsk
@ -14,12 +15,12 @@ pt3_lib.dsk: PT3_TEST HELLO
$(DOS33) -y pt3_lib.dsk BSAVE -a 0x1000 PT3_TEST
HELLO: hello.bas
../asoft_basic-utils/tokenize_asoft < hello.bas > HELLO
$(TOKENIZE) < hello.bas > HELLO
#
PT3_TEST: pt3_test.o
ld65 -o PT3_TEST pt3_test.o -C ../linker_scripts/apple2_1000.inc
ld65 -o PT3_TEST pt3_test.o -C ../../linker_scripts/apple2_1000.inc
pt3_test.o: pt3_test.s \
pt3_lib_init.s pt3_lib_core.s pt3_lib_irq_handler.s \

23
music/pt3_player/Makefile
View File

@ -1,12 +1,13 @@
include ../Makefile.inc
include ../../Makefile.inc
DOS33 = ../dos33fs-utils/dos33
PNG2GR = ../gr-utils/png2gr
DOS33 = ../../utils/dos33fs-utils/dos33
PNG2GR = ../../utils/gr-utils/png2gr
TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
all: pt3_player.dsk pt3_debug.dsk
$(DOS33):
cd ../dos33fs-utils && make
cd ../../utils/dos33fs-utils && make
pt3_player.dsk: PT3_PLAYER HELLO
cp empty.dsk pt3_player.dsk
@ -65,18 +66,18 @@ pt3_debug.dsk: PT3_DUMPER PT3_TIMER PT3_TABLE_TEST HELLO_DEBUG DUMP
$(DOS33) -y pt3_debug.dsk BSAVE -a 0x4000 ./music/DY.PT3
HELLO: hello.bas
../asoft_basic-utils/tokenize_asoft < hello.bas > HELLO
$(TOKENIZE) < hello.bas > HELLO
HELLO_DEBUG: hello_debug.bas
../asoft_basic-utils/tokenize_asoft < hello_debug.bas > HELLO_DEBUG
$(TOKENIZE) < hello_debug.bas > HELLO_DEBUG
DUMP: dump.bas
../asoft_basic-utils/tokenize_asoft < dump.bas > DUMP
$(TOKENIZE) < dump.bas > DUMP
#
PT3_PLAYER: pt3_player.o
ld65 -o PT3_PLAYER pt3_player.o -C ../linker_scripts/apple2_1000.inc
ld65 -o PT3_PLAYER pt3_player.o -C ../../linker_scripts/apple2_1000.inc
pt3_player.o: pt3_player.s \
gr_fast_clear.s random16.s fire.s \
@ -89,7 +90,7 @@ pt3_player.o: pt3_player.s \
#
PT3_TIMER: pt3_timer.o
ld65 -o PT3_TIMER pt3_timer.o -C ../linker_scripts/apple2_1000.inc
ld65 -o PT3_TIMER pt3_timer.o -C ../../linker_scripts/apple2_1000.inc
pt3_timer.o: pt3_timer.s \
gr_fast_clear.s zp.inc \
@ -99,7 +100,7 @@ pt3_timer.o: pt3_timer.s \
#
PT3_DUMPER: pt3_dumper.o
ld65 -o PT3_DUMPER pt3_dumper.o -C ../linker_scripts/apple2_1000.inc
ld65 -o PT3_DUMPER pt3_dumper.o -C ../../linker_scripts/apple2_1000.inc
pt3_dumper.o: pt3_dumper.s \
gr_fast_clear.s zp.inc \
@ -109,7 +110,7 @@ pt3_dumper.o: pt3_dumper.s \
#
PT3_TABLE_TEST: pt3_table_test.o
ld65 -o PT3_TABLE_TEST pt3_table_test.o -C ../linker_scripts/apple2_1000.inc
ld65 -o PT3_TABLE_TEST pt3_table_test.o -C ../../linker_scripts/apple2_1000.inc
pt3_table_test.o: pt3_table_test.s \
gr_fast_clear.s pt3_lib_core.s pt3_lib_init.s zp.inc

17
music/sound_effects/Makefile
View File

@ -1,10 +1,11 @@
include ../Makefile.inc
include ../../Makefile.inc
DOS33 = ../dos33fs-utils/dos33
PNG_TO_40x96 = ../gr-utils/png_to_40x96
PNG_TO_40x48D = ../gr-utils/png_to_40x48d
PNG2RLE = ../gr-utils/png2rle
B2D = ../bmp2dhr/b2d
DOS33 = ../../utils/dos33fs-utils/dos33
PNG_TO_40x96 = ../../utils/gr-utils/png_to_40x96
PNG_TO_40x48D = ../../utils/gr-utils/png_to_40x48d
PNG2RLE = ../../utils/gr-utils/png2rle
B2D = ../../utils/bmp2dhr/b2d
TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
all: sound.dsk
@ -14,7 +15,7 @@ sound.dsk: HELLO SOUND
$(DOS33) -y sound.dsk BSAVE -a 0x1000 SOUND
SOUND: sound.o
ld65 -o SOUND sound.o -C ../linker_scripts/apple2_1000.inc
ld65 -o SOUND sound.o -C ../../linker_scripts/apple2_1000.inc
sound.o: sound.s
ca65 -o sound.o sound.s -l sound.lst
@ -22,7 +23,7 @@ sound.o: sound.s
###
HELLO: hello.bas
../asoft_basic-utils/tokenize_asoft < hello.bas > HELLO
$(TOKENIZE) < hello.bas > HELLO
####

12
music/still_alive/Makefile
View File

@ -1,7 +1,7 @@
include ../Makefile.inc
include ../../Makefile.inc
DOS33 = ../dos33fs-utils/dos33
TOKENIZE = ../asoft_basic-utils/tokenize_asoft
DOS33 = ../../utils/dos33fs-utils/dos33
TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
all: still_alive.dsk
@ -13,7 +13,7 @@ still_alive.dsk: SA_COMPRESSED STILL_ALIVE TITLE.BAS ENDING
# $(DOS33) -y still_alive.dsk SAVE B GLADOS.HGR
SA_COMPRESSED: sa_compressed.o
ld65 -o SA_COMPRESSED sa_compressed.o -C ../linker_scripts/apple2_5900.inc
ld65 -o SA_COMPRESSED sa_compressed.o -C ../../linker_scripts/apple2_5900.inc
sa_compressed.o: sa_compressed.s \
STILL_ALIVE.lz4 ENDING.lz4 SA.ED.lz4 SA.KR4.lz4
@ -37,7 +37,7 @@ ENDING.lz4: ENDING
STILL_ALIVE: still_alive.o
ld65 -o STILL_ALIVE still_alive.o -C ../linker_scripts/apple2_800.inc
ld65 -o STILL_ALIVE still_alive.o -C ../../linker_scripts/apple2_800.inc
still_alive.o: still_alive.s \
mockingboard_a.s lz4_decode.s \
@ -50,7 +50,7 @@ still_alive.o: still_alive.s \
ENDING: ending.o
ld65 -o ENDING ending.o -C ../linker_scripts/apple2_1800.inc
ld65 -o ENDING ending.o -C ../../linker_scripts/apple2_1800.inc
ending.o: ending.s \
GLADOS.HGR

24
textmode/Makefile Normal file
View File

@ -0,0 +1,24 @@
include ../Makefile.inc
DOS33 = ../utils/dos33fs-utils/dos33
TOKENIZE = ../utils/asoft_basic-utils/tokenize_asoft
all: plain.dsk
plain.dsk: PLAIN
cp empty.dsk plain.dsk
$(DOS33) -y plain.dsk BSAVE -a 0x0800 PLAIN
###
PLAIN: plain.o
ld65 -o PLAIN plain.o -C ../linker_scripts/apple2_800.inc
plain.o: plain.s
ca65 -o plain.o plain.s -l plain.lst
####
clean:
rm -f *~ *.o *.lst PLAIN

2
textmode/README Normal file
View File

@ -0,0 +1,2 @@
some scratch files when working on textmode issues

6
vaporlock/Makefile Normal file
View File

@ -0,0 +1,6 @@
all:
cd fancy_lores && make
clean:
cd fancy_lores && make clean
rm -f *~

6
vaporlock/README Normal file
View File

@ -0,0 +1,6 @@
Various utilities that use the "vapor lock" method of cycle-counted
mid-screen graphics switches
fancy_lores:
viewer for 40x96 and 40x48i cycle-counted graphics modes

16
vaporlock/fancy_lores/Makefile
View File

@ -1,8 +1,8 @@
include ../Makefile.inc
include ../../Makefile.inc
DOS33 = ../dos33fs-utils/dos33
PNG_TO_40x96 = ../gr-utils/png_to_40x96
PNG_TO_40x48D = ../gr-utils/png_to_40x48d
DOS33 = ../../utils/dos33fs-utils/dos33
PNG_TO_40x96 = ../../utils/gr-utils/png_to_40x96
PNG_TO_40x48D = ../../utils/gr-utils/png_to_40x48d
all: fancy_lores_viewer.dsk
@ -17,7 +17,7 @@ fancy_lores_viewer.dsk: DISP4096 DISP4048D
####
DISP4096: disp4096.o
ld65 -o DISP4096 disp4096.o -C ../linker_scripts/apple2_1000.inc
ld65 -o DISP4096 disp4096.o -C ../../linker_scripts/apple2_1000.inc
disp4096.o: disp4096.s gr_copy.s \
apple_40_96.inc katahdin_40_96.inc df_girl_40_96.inc df_girl2_40_96.inc
@ -26,7 +26,7 @@ disp4096.o: disp4096.s gr_copy.s \
####
DISP4048D: disp4048d.o
ld65 -o DISP4048D disp4048d.o -C ../linker_scripts/apple2_1000.inc
ld65 -o DISP4048D disp4048d.o -C ../../linker_scripts/apple2_1000.inc
disp4048d.o: disp4048d.s gr_copy.s \
apple_40_48d.inc katahdin_40_48d.inc spacebars_40_48d.inc df_girl_40_48d.inc k_40_48d.inc
@ -73,6 +73,4 @@ install:
cp png_to_40x96 $(INSTALL_LOC)
clean:
rm -f *~ *.o *.lst *.inc png_to_40x96 png_to_40x48d DISP4096 DISP4048D
rm -f *~ *.o *.lst *.inc png_to_40x96 png_to_40x48d DISP4096 DISP4048D genpal

4
vaporlock/fancy_lores/disp4048d.s
View File

@ -291,8 +291,8 @@ gr_offsets:
.word $450,$4d0,$550,$5d0,$650,$6d0,$750,$7d0
.include "../asm_routines/gr_unrle.s"
.include "../asm_routines/keypress.s"
.include "../../asm_routines/gr_unrle.s"
.include "../../asm_routines/keypress.s"
.include "gr_copy.s"
.include "delay_a.s"
.include "vapor_lock.s"

4
vaporlock/fancy_lores/disp4096.s
View File

@ -291,8 +291,8 @@ gr_offsets:
.word $450,$4d0,$550,$5d0,$650,$6d0,$750,$7d0
.include "../asm_routines/gr_unrle.s"
.include "../asm_routines/keypress.s"
.include "../../asm_routines/gr_unrle.s"
.include "../../asm_routines/keypress.s"
.include "gr_copy.s"
.include "vapor_lock.s"
.include "delay_a.s"