diff --git a/demosplash/Makefile b/demosplash/Makefile index a5ad39ac..ec3823f0 100644 --- a/demosplash/Makefile +++ b/demosplash/Makefile @@ -9,12 +9,12 @@ B2D = ../bmp2dhr/b2d all: demosplash.dsk -demosplash.dsk: HELLO LOADER BOOK_HGR2C.BIN MUSICTEST # DEMOSPLASH +demosplash.dsk: HELLO LOADER DEMOSPLASH cp empty.dsk demosplash.dsk $(DOS33) -y demosplash.dsk SAVE A HELLO $(DOS33) -y demosplash.dsk BSAVE -a 0x1400 LOADER -# $(DOS33) -y demosplash.dsk BSAVE -a 0x1700 DEMOSPLASH - $(DOS33) -y demosplash.dsk BSAVE -a 0x1700 MUSICTEST + $(DOS33) -y demosplash.dsk BSAVE -a 0x1700 DEMOSPLASH +# $(DOS33) -y demosplash.dsk BSAVE -a 0x1700 MUSICTEST #### @@ -23,31 +23,31 @@ HELLO: hello.bas ../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 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 - -##### - -MUSICTEST: musictest.o - ld65 -o MUSICTEST musictest.o -C ../linker_scripts/apple2_1700.inc - -musictest.o: musictest.s \ zp.inc hardware.inc \ appleII_intro.s font.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 \ credits.s credits_bg.inc offsets_table.s \ dya_space_demo2.pt3 - ca65 -o musictest.o musictest.s -l musictest.lst + ca65 -o demosplash.o demosplash.s -l demosplash.lst ##### diff --git a/demosplash/credits_bg.png b/demosplash/credits_bg.png new file mode 100644 index 00000000..fac63d21 Binary files /dev/null and b/demosplash/credits_bg.png differ diff --git a/demosplash/demosplash.s b/demosplash/demosplash.s index 7304d267..870a56e6 100644 --- a/demosplash/demosplash.s +++ b/demosplash/demosplash.s @@ -18,6 +18,51 @@ demosplash2019: jsr clear_ay_both 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 ; sta LOOP @@ -45,22 +90,38 @@ demosplash2019: ; apple II intro ;============================ + nop + nop + nop + + ; jsr appleII_intro - ;=========================== - ; show some pictures - ;============================ - - - ; start music - -; cli ; enable interrupts ;=========================== ; missing scene ;=========================== -; jsr missing_intro +; nop +; nop +; nop + + jsr missing_intro + + + ;======================== + ; start irq music + ;======================== + +; cli ; enable interrupts + + ;=========================== + ; book scene + ;============================ + + +; jsr open_book + ;=========================== ; starbase scene @@ -72,14 +133,22 @@ demosplash2019: ; escape scene ;=========================== - jsr escape +; jsr escape ;=========================== ; book scene ;=========================== -; jsr book + nop + nop + nop +; jsr end_book + ;=========================== + ; credits + ;=========================== + + jsr credits ; wait wait wait @@ -102,17 +171,24 @@ wait_until_keypressed: ; Apple II intro .include "appleII_intro.s" .include "appleII_40_96.inc" + +.align $100 .include "vapor_lock.s" .include "delay_a.s" .include "gr_unrle.s" -.include "gr_offsets.s" .include "gr_copy.s" +.include "gr_offsets.s" ;.include "text_print.s" .include "gr_pageflip.s" .align $100 .include "gr_fast_clear.s" ;.include "gr_overlay.s" +.align $100 +.include "movement_table.s" +.include "font.s" +.align $100 +.include "offsets_table.s" ; missing .include "missing.s" @@ -121,18 +197,24 @@ wait_until_keypressed: .include "starbase.s" ; escape -.include "escape.s" +;.include "escape.s" ; book .include "book.s" +; credits +.include "credits.s" + ; Music player .include "pt3_lib_core.s" .include "pt3_lib_init.s" .include "pt3_lib_mockingboard.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" @@ -141,4 +223,4 @@ PT3_LOC = song ; must be page aligned .align 256 song: -.incbin "dya_space_demo.pt3" +.incbin "dya_space_demo2.pt3" diff --git a/demosplash/musictest.s b/demosplash/demosplash.s.old similarity index 59% rename from demosplash/musictest.s rename to demosplash/demosplash.s.old index 870a56e6..7304d267 100644 --- a/demosplash/musictest.s +++ b/demosplash/demosplash.s.old @@ -18,51 +18,6 @@ demosplash2019: jsr clear_ay_both 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 ; sta LOOP @@ -90,38 +45,22 @@ frame_decode_loop: ; apple II intro ;============================ - nop - nop - nop - - ; jsr appleII_intro + ;=========================== + ; show some pictures + ;============================ + + + ; start music + +; cli ; enable interrupts ;=========================== ; missing scene ;=========================== -; nop -; nop -; nop - - jsr missing_intro - - - ;======================== - ; start irq music - ;======================== - -; cli ; enable interrupts - - ;=========================== - ; book scene - ;============================ - - -; jsr open_book - +; jsr missing_intro ;=========================== ; starbase scene @@ -133,22 +72,14 @@ frame_decode_loop: ; escape scene ;=========================== -; jsr escape + jsr escape ;=========================== ; book scene ;=========================== - nop - nop - nop -; jsr end_book +; jsr book - ;=========================== - ; credits - ;=========================== - - jsr credits ; wait wait wait @@ -171,24 +102,17 @@ wait_until_keypressed: ; Apple II intro .include "appleII_intro.s" .include "appleII_40_96.inc" - -.align $100 .include "vapor_lock.s" .include "delay_a.s" .include "gr_unrle.s" -.include "gr_copy.s" .include "gr_offsets.s" +.include "gr_copy.s" ;.include "text_print.s" .include "gr_pageflip.s" .align $100 .include "gr_fast_clear.s" ;.include "gr_overlay.s" -.align $100 -.include "movement_table.s" -.include "font.s" -.align $100 -.include "offsets_table.s" ; missing .include "missing.s" @@ -197,24 +121,18 @@ wait_until_keypressed: .include "starbase.s" ; escape -;.include "escape.s" +.include "escape.s" ; book .include "book.s" -; credits -.include "credits.s" - ; Music player .include "pt3_lib_core.s" .include "pt3_lib_init.s" .include "pt3_lib_mockingboard.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" @@ -223,4 +141,4 @@ PT3_LOC = song ; must be page aligned .align 256 song: -.incbin "dya_space_demo2.pt3" +.incbin "dya_space_demo.pt3" diff --git a/demosplash/hello.bas b/demosplash/hello.bas index 758b0f52..bb7f10ce 100644 --- a/demosplash/hello.bas +++ b/demosplash/hello.bas @@ -1,3 +1,4 @@ 5 HOME - 200 PRINT CHR$ (4)"CATALOG" +' 200 PRINT CHR$ (4)"CATALOG" + 200 PRINT CHR$ (4)"BRUN LOADER"