Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2025-01-12 15:30:55 +00:00
Code Issues Projects Releases Wiki Activity

ds: rename to make more sense

Browse Source 
also faster loads
This commit is contained in:
Vince Weaver 2019-11-02 21:05:11 -04:00
parent 6aa869da59
commit d63c556d3d
5 changed files with 137 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
demosplash/Makefile
View File

@ -9,12 +9,12 @@ B2D = ../bmp2dhr/b2d
all: demosplash.dsk all: demosplash.dsk
demosplash.dsk: HELLO LOADER BOOK_HGR2C.BIN MUSICTEST # DEMOSPLASH demosplash.dsk: HELLO LOADER DEMOSPLASH
cp empty.dsk demosplash.dsk cp empty.dsk demosplash.dsk
$(DOS33) -y demosplash.dsk SAVE A HELLO $(DOS33) -y demosplash.dsk SAVE A HELLO
$(DOS33) -y demosplash.dsk BSAVE -a 0x1400 LOADER $(DOS33) -y demosplash.dsk BSAVE -a 0x1400 LOADER
# $(DOS33) -y demosplash.dsk BSAVE -a 0x1700 DEMOSPLASH $(DOS33) -y demosplash.dsk BSAVE -a 0x1700 DEMOSPLASH
$(DOS33) -y demosplash.dsk BSAVE -a 0x1700 MUSICTEST # $(DOS33) -y demosplash.dsk BSAVE -a 0x1700 MUSICTEST
#### ####
@ -23,31 +23,31 @@ HELLO: hello.bas
../asoft_basic-utils/tokenize_asoft < hello.bas > HELLO ../asoft_basic-utils/tokenize_asoft < hello.bas > HELLO
#####
#DEMOSPLASH: demosplash.o
# ld65 -o DEMOSPLASH demosplash.o -C ../linker_scripts/apple2_1700.inc
#demosplash.o: demosplash.s \
# zp.inc hardware.inc \
# appleII_intro.s vapor_lock.s delay_a.s \
# pt3_lib_init.s pt3_lib_core.s pt3_lib_mockingboard.s \
# interrupt_handler.s \
# starbase.s starbase_action.s \
# graphics/starbase/starbase.inc \
# graphics/sprites/alien.inc graphics/sprites/astronaut.inc \
# dya_space_demo.pt3 appleII_40_96.inc \
# book.s book_40_48d.inc \
# missing.s \
# escape.s
# ca65 -o demosplash.o demosplash.s -l demosplash.lst
##### #####
DEMOSPLASH: demosplash.o DEMOSPLASH: demosplash.o
ld65 -o DEMOSPLASH demosplash.o -C ../linker_scripts/apple2_1700.inc ld65 -o DEMOSPLASH demosplash.o -C ../linker_scripts/apple2_1700.inc
demosplash.o: demosplash.s \ demosplash.o: demosplash.s \
zp.inc hardware.inc \
appleII_intro.s vapor_lock.s delay_a.s \
pt3_lib_init.s pt3_lib_core.s pt3_lib_mockingboard.s \
interrupt_handler.s \
starbase.s starbase_action.s \
graphics/starbase/starbase.inc \
graphics/sprites/alien.inc graphics/sprites/astronaut.inc \
dya_space_demo.pt3 appleII_40_96.inc \
book.s book_40_48d.inc \
missing.s \
escape.s
ca65 -o demosplash.o demosplash.s -l demosplash.lst
#####
MUSICTEST: musictest.o
ld65 -o MUSICTEST musictest.o -C ../linker_scripts/apple2_1700.inc
musictest.o: musictest.s \
zp.inc hardware.inc \ zp.inc hardware.inc \
appleII_intro.s font.s \ appleII_intro.s font.s \
pt3_lib_init.s pt3_lib_core.s pt3_lib_mockingboard.s \ pt3_lib_init.s pt3_lib_core.s pt3_lib_mockingboard.s \
@ -58,7 +58,7 @@ musictest.o: musictest.s \
book.s book_40_48d.inc \ book.s book_40_48d.inc \
credits.s credits_bg.inc offsets_table.s \ credits.s credits_bg.inc offsets_table.s \
dya_space_demo2.pt3 dya_space_demo2.pt3
ca65 -o musictest.o musictest.s -l musictest.lst ca65 -o demosplash.o demosplash.s -l demosplash.lst
##### #####

BIN
demosplash/credits_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

112
demosplash/demosplash.s
View File

@ -18,6 +18,51 @@ demosplash2019:
jsr clear_ay_both jsr clear_ay_both
jsr pt3_init_song jsr pt3_init_song
;====================================
; generate 4 patterns worth of music
; at address $9000
lda #0
sta FRAME_PAGE
lda #0
sta FRAME_OFFSET
frame_decode_loop:
jsr pt3_make_frame
jsr pt3_write_frame
inc FRAME_OFFSET
bne frame_decode_loop
inc r0_wrsmc+2 ; 6
inc r1_wrsmc+2 ; 6
inc r2_wrsmc+2 ; 6
inc r4_wrsmc+2 ; 6
inc r13_wrsmc+2 ; 6
inc r6_wrsmc+2 ; 6
inc r7_wrsmc+2 ; 6
inc r8_wrsmc+2 ; 6
inc r9_wrsmc+2 ; 6
inc r11_wrsmc+2 ; 6
inc r12_wrsmc+2 ; 6
inc FRAME_PAGE
lda FRAME_PAGE
cmp #3
bne frame_decode_loop
lda #0
sta FRAME_OFFSET
; lda #1 ; lda #1
; sta LOOP ; sta LOOP
@ -45,22 +90,38 @@ demosplash2019:
; apple II intro ; apple II intro
;============================ ;============================
nop
nop
nop
; jsr appleII_intro ; jsr appleII_intro
;===========================
; show some pictures
;============================
; start music
; cli ; enable interrupts
;=========================== ;===========================
; missing scene ; missing scene
;=========================== ;===========================
; jsr missing_intro ; nop
; nop
; nop
jsr missing_intro
;========================
; start irq music
;========================
; cli ; enable interrupts
;===========================
; book scene
;============================
; jsr open_book
;=========================== ;===========================
; starbase scene ; starbase scene
@ -72,14 +133,22 @@ demosplash2019:
; escape scene ; escape scene
;=========================== ;===========================
jsr escape ; jsr escape
;=========================== ;===========================
; book scene ; book scene
;=========================== ;===========================
; jsr book nop
nop
nop
; jsr end_book
;===========================
; credits
;===========================
jsr credits
; wait wait wait ; wait wait wait
@ -102,17 +171,24 @@ wait_until_keypressed:
; Apple II intro ; Apple II intro
.include "appleII_intro.s" .include "appleII_intro.s"
.include "appleII_40_96.inc" .include "appleII_40_96.inc"
.align $100
.include "vapor_lock.s" .include "vapor_lock.s"
.include "delay_a.s" .include "delay_a.s"
.include "gr_unrle.s" .include "gr_unrle.s"
.include "gr_offsets.s"
.include "gr_copy.s" .include "gr_copy.s"
.include "gr_offsets.s"
;.include "text_print.s" ;.include "text_print.s"
.include "gr_pageflip.s" .include "gr_pageflip.s"
.align $100 .align $100
.include "gr_fast_clear.s" .include "gr_fast_clear.s"
;.include "gr_overlay.s" ;.include "gr_overlay.s"
.align $100
.include "movement_table.s"
.include "font.s"
.align $100
.include "offsets_table.s"
; missing ; missing
.include "missing.s" .include "missing.s"
@ -121,18 +197,24 @@ wait_until_keypressed:
.include "starbase.s" .include "starbase.s"
; escape ; escape
.include "escape.s" ;.include "escape.s"
; book ; book
.include "book.s" .include "book.s"
; credits
.include "credits.s"
; Music player ; Music player
.include "pt3_lib_core.s" .include "pt3_lib_core.s"
.include "pt3_lib_init.s" .include "pt3_lib_init.s"
.include "pt3_lib_mockingboard.s" .include "pt3_lib_mockingboard.s"
.include "interrupt_handler.s" .include "interrupt_handler.s"
.include "pt3_lib_play_frame.s"
.include "pt3_lib_write_frame.s"
.include "create_update_type1.s"
; Images (no need to align) ; Pictures (no need to align)
.include "credits_bg.inc" .include "credits_bg.inc"
@ -141,4 +223,4 @@ PT3_LOC = song
; must be page aligned ; must be page aligned
.align 256 .align 256
song: song:
.incbin "dya_space_demo.pt3" .incbin "dya_space_demo2.pt3"

112
demosplash/musictest.s → demosplash/demosplash.s.old
View File

@ -18,51 +18,6 @@ demosplash2019:
jsr clear_ay_both jsr clear_ay_both
jsr pt3_init_song jsr pt3_init_song
;====================================
; generate 4 patterns worth of music
; at address $9000
lda #0
sta FRAME_PAGE
lda #0
sta FRAME_OFFSET
frame_decode_loop:
jsr pt3_make_frame
jsr pt3_write_frame
inc FRAME_OFFSET
bne frame_decode_loop
inc r0_wrsmc+2 ; 6
inc r1_wrsmc+2 ; 6
inc r2_wrsmc+2 ; 6
inc r4_wrsmc+2 ; 6
inc r13_wrsmc+2 ; 6
inc r6_wrsmc+2 ; 6
inc r7_wrsmc+2 ; 6
inc r8_wrsmc+2 ; 6
inc r9_wrsmc+2 ; 6
inc r11_wrsmc+2 ; 6
inc r12_wrsmc+2 ; 6
inc FRAME_PAGE
lda FRAME_PAGE
cmp #3
bne frame_decode_loop
lda #0
sta FRAME_OFFSET
; lda #1 ; lda #1
; sta LOOP ; sta LOOP
@ -90,38 +45,22 @@ frame_decode_loop:
; apple II intro ; apple II intro
;============================ ;============================
nop
nop
nop
; jsr appleII_intro ; jsr appleII_intro
;===========================
; show some pictures
;============================
; start music
; cli ; enable interrupts
;=========================== ;===========================
; missing scene ; missing scene
;=========================== ;===========================
; nop ; jsr missing_intro
; nop
; nop
jsr missing_intro
;========================
; start irq music
;========================
; cli ; enable interrupts
;===========================
; book scene
;============================
; jsr open_book
;=========================== ;===========================
; starbase scene ; starbase scene
@ -133,22 +72,14 @@ frame_decode_loop:
; escape scene ; escape scene
;=========================== ;===========================
; jsr escape jsr escape
;=========================== ;===========================
; book scene ; book scene
;=========================== ;===========================
nop ; jsr book
nop
nop
; jsr end_book
;===========================
; credits
;===========================
jsr credits
; wait wait wait ; wait wait wait
@ -171,24 +102,17 @@ wait_until_keypressed:
; Apple II intro ; Apple II intro
.include "appleII_intro.s" .include "appleII_intro.s"
.include "appleII_40_96.inc" .include "appleII_40_96.inc"
.align $100
.include "vapor_lock.s" .include "vapor_lock.s"
.include "delay_a.s" .include "delay_a.s"
.include "gr_unrle.s" .include "gr_unrle.s"
.include "gr_copy.s"
.include "gr_offsets.s" .include "gr_offsets.s"
.include "gr_copy.s"
;.include "text_print.s" ;.include "text_print.s"
.include "gr_pageflip.s" .include "gr_pageflip.s"
.align $100 .align $100
.include "gr_fast_clear.s" .include "gr_fast_clear.s"
;.include "gr_overlay.s" ;.include "gr_overlay.s"
.align $100
.include "movement_table.s"
.include "font.s"
.align $100
.include "offsets_table.s"
; missing ; missing
.include "missing.s" .include "missing.s"
@ -197,24 +121,18 @@ wait_until_keypressed:
.include "starbase.s" .include "starbase.s"
; escape ; escape
;.include "escape.s" .include "escape.s"
; book ; book
.include "book.s" .include "book.s"
; credits
.include "credits.s"
; Music player ; Music player
.include "pt3_lib_core.s" .include "pt3_lib_core.s"
.include "pt3_lib_init.s" .include "pt3_lib_init.s"
.include "pt3_lib_mockingboard.s" .include "pt3_lib_mockingboard.s"
.include "interrupt_handler.s" .include "interrupt_handler.s"
.include "pt3_lib_play_frame.s"
.include "pt3_lib_write_frame.s"
.include "create_update_type1.s"
; Pictures (no need to align) ; Images (no need to align)
.include "credits_bg.inc" .include "credits_bg.inc"
@ -223,4 +141,4 @@ PT3_LOC = song
; must be page aligned ; must be page aligned
.align 256 .align 256
song: song:
.incbin "dya_space_demo2.pt3" .incbin "dya_space_demo.pt3"

3
demosplash/hello.bas
View File

@ -1,3 +1,4 @@
5 HOME 5 HOME
200 PRINT CHR$ (4)"CATALOG" ' 200 PRINT CHR$ (4)"CATALOG"
200 PRINT CHR$ (4)"BRUN LOADER"