From 2005ddd94ecc2a705fdec68d7b1d3f36abc11948 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Wed, 13 Nov 2024 20:07:45 -0500 Subject: [PATCH] driven: re-arrange files to final location (hopefully) in order of them loading to hopefully avoid extra track movement --- demos/driven/Makefile | 17 +++++++++++------ demos/driven/NOTES | 16 +++++++++------- demos/driven/part05_atrus/Makefile | 1 + demos/driven/part05_atrus/atrus.s | 16 ++++++++++++++++ demos/driven/part10_graphics/Makefile | 4 ++-- demos/driven/part10_graphics/graphics.s | 4 ++-- demos/driven/qload.s | 8 ++++---- .../wipes/fx.hgr.center.by.pixel.s | 0 .../{part10_graphics => }/wipes/fx.hgr.fizzle.s | 0 9 files changed, 45 insertions(+), 21 deletions(-) rename demos/driven/{part10_graphics => }/wipes/fx.hgr.center.by.pixel.s (100%) rename demos/driven/{part10_graphics => }/wipes/fx.hgr.fizzle.s (100%) diff --git a/demos/driven/Makefile b/demos/driven/Makefile index df186d8c..c10fb2b8 100644 --- a/demos/driven/Makefile +++ b/demos/driven/Makefile @@ -22,11 +22,14 @@ driven.dsk: QBOOT QLOAD \ $(DOS33_RAW) driven.dsk 0 4 QBOOT 2 1 $(DOS33_RAW) driven.dsk 1 0 QLOAD 0 0 $(DOS33_RAW) driven.dsk 2 0 MUSIC 0 0 - $(DOS33_RAW) driven.dsk 5 0 ./part00_intro/INTRO 0 0 - $(DOS33_RAW) driven.dsk 8 0 ./part20_credits/CREDITS 0 0 - $(DOS33_RAW) driven.dsk 12 0 ./part05_atrus/ATRUS 0 0 - $(DOS33_RAW) driven.dsk 15 0 ./part10_graphics/GRAPHICS 0 0 - $(DOS33_RAW) driven.dsk 21 0 ./part07_maglev/MOVIE_MAGLEV_RIDE 0 0 + $(DOS33_RAW) driven.dsk 5 0 ./part07_maglev/MOVIE_MAGLEV_RIDE 0 0 + $(DOS33_RAW) driven.dsk 13 0 ./part05_atrus/ATRUS 0 0 + $(DOS33_RAW) driven.dsk 17 0 ./part00_intro/INTRO 0 0 + $(DOS33_RAW) driven.dsk 20 0 ./part10_graphics/GRAPHICS 0 0 + $(DOS33_RAW) driven.dsk 26 0 ./part20_credits/CREDITS 0 0 + + + #### @@ -72,7 +75,8 @@ qload.o: zp.inc hardware.inc common_defines.inc music.inc qload.s \ pt3_lib_detect_model.s pt3_lib_mockingboard_detect.s \ pt3_lib_mockingboard_setup.s interrupt_handler.s \ pt3_lib_mockingboard_patch.s \ - irq_wait.s vblank.s hgr_page_flip.s + irq_wait.s vblank.s hgr_page_flip.s \ + wipes/fx.hgr.fizzle.s ca65 -o qload.o qload.s -l qload.lst #### @@ -109,6 +113,7 @@ qload.inc: generate_common QLOAD ./generate_common -a 0x1200 -s inc_base5 qload.lst >> qload.inc ./generate_common -a 0x1200 -s draw_full_dni_number qload.lst >> qload.inc ./generate_common -a 0x1200 -s gr_flip_page qload.lst >> qload.inc + ./generate_common -a 0x1200 -s do_wipe_fizzle qload.lst >> qload.inc #### diff --git a/demos/driven/NOTES b/demos/driven/NOTES index 7f38488b..0b0d1d35 100644 --- a/demos/driven/NOTES +++ b/demos/driven/NOTES @@ -33,15 +33,17 @@ Mem usage plan: Disk1 Map (disk has 35 tracks, each 4k in size) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ T 0 = Qboot -T 1 = QLOAD 1541 bytes 1T ( 4096) 3k free +T 1 = QLOAD 2122 bytes 1T ( 4096) 1k free T 2 = MUSIC 8645 bytes 3T (12288) 3k free -T 5 = INTRO 9335 bytes 3T (12288) 3k free -T 8 = CREDITS 7487 bytes 2T ( 8192) 500B free +T 5 = MAGLEV 32190 bytes 8T (32768) 0k free +T 13 = ATRUS 14711 bytes 4T (12288) 2k free +T 17 = INTRO 10875 bytes 3T (12288) 2k free +T 20 = GRAPHICS 21917 bytes 6T (24576) 2k free +T 26 = CREDITS 7468 bytes 2T ( 8192) 500B free + T 11 = DNI 2133 bytes 1T (4096) 2k free -T 12 = ATRUS 9506 bytes 3T (12288) 3k free -T 15 = GRAPHICS 21967 bytes 6T (24576) 2k free -T 21 = MAGLEV 32000 bytes 8T (32768) 0k free -DISK HAS 10,29..34 free = 24k free + +DISK HAS 28..34 free = 24k free Loader: Load QLOAD->$1000/$1FFF diff --git a/demos/driven/part05_atrus/Makefile b/demos/driven/part05_atrus/Makefile index eaa68cb4..7967c441 100644 --- a/demos/driven/part05_atrus/Makefile +++ b/demos/driven/part05_atrus/Makefile @@ -15,6 +15,7 @@ atrus.o: atrus.s \ graphics/atrus03_iipix.hgr.zx02 \ graphics/atrus10_iipix.hgr.zx02 \ graphics/atrus11_iipix.hgr.zx02 \ + graphics/overlook_n.hgr.zx02 \ font/large_font.inc \ horiz_scroll.s ca65 -o atrus.o atrus.s -l atrus.lst diff --git a/demos/driven/part05_atrus/atrus.s b/demos/driven/part05_atrus/atrus.s index 10dc3b27..0fd9d6b1 100644 --- a/demos/driven/part05_atrus/atrus.s +++ b/demos/driven/part05_atrus/atrus.s @@ -129,6 +129,20 @@ atrus_opener: ; jsr wait_until_keypress + bit PAGE1 + + ;================================= + ; plasma + ;================================= + + lda #overlook_graphics + sta zx_src_h+1 + lda #$40 + jsr zx02_full_decomp + + jsr do_wipe_fizzle rts @@ -138,6 +152,8 @@ atrus10_graphics: .incbin "graphics/atrus10_iipix.hgr.zx02" atrus11_graphics: .incbin "graphics/atrus11_iipix.hgr.zx02" +overlook_graphics: + .incbin "graphics/overlook_n.hgr.zx02" atrus_text: .byte 7,20,"Thank God you've returned.",0 diff --git a/demos/driven/part10_graphics/Makefile b/demos/driven/part10_graphics/Makefile index 40b42dc4..83fc264a 100644 --- a/demos/driven/part10_graphics/Makefile +++ b/demos/driven/part10_graphics/Makefile @@ -16,8 +16,8 @@ graphics.o: graphics.s \ graphics/a2_atrus.hgr.zx02 \ graphics/riven_233.aux.zx02 \ graphics/riven_233.bin.zx02 \ - wipes/fx.hgr.center.by.pixel.s \ - wipes/fx.hgr.fizzle.s + ../wipes/fx.hgr.center.by.pixel.s \ + ../wipes/fx.hgr.fizzle.s ca65 -o graphics.o graphics.s -l graphics.lst ### diff --git a/demos/driven/part10_graphics/graphics.s b/demos/driven/part10_graphics/graphics.s index bf8b87c7..3167f91c 100644 --- a/demos/driven/part10_graphics/graphics.s +++ b/demos/driven/part10_graphics/graphics.s @@ -263,6 +263,6 @@ atrus_message2: .byte 0,22,"Perhaps that's because we ran out of",0 .byte 0,23,"time before the submission deadline.",0 -.include "wipes/fx.hgr.center.by.pixel.s" -.include "wipes/fx.hgr.fizzle.s" +.include "../wipes/fx.hgr.center.by.pixel.s" +;.include "../wipes/fx.hgr.fizzle.s" diff --git a/demos/driven/qload.s b/demos/driven/qload.s index cfd8efbc..617d10ed 100644 --- a/demos/driven/qload.s +++ b/demos/driven/qload.s @@ -183,8 +183,8 @@ aux_dest: .byte $20,$10,$80,$20 ; track_array: - .byte 2,2,5,8 ; ???, MUSIC, INTRO, CREDITS - .byte 11,12,15,21 ; DNI, ATRUS, GRAPHICS, MAGLEV + .byte 2,2,17,26 ; ???, MUSIC, INTRO, CREDITS + .byte 28,13,20,5 ; DNI, ATRUS, GRAPHICS, MAGLEV .byte 25,26,27,28 ; sector_array: @@ -194,7 +194,7 @@ sector_array: length_array: .byte 48,48,48,32 ; ???, MUSIC, INTRO, CREDITS - .byte 16,48,95,127 ; DNI, ATRUS, GRAPHICS, MAGLEV + .byte 16,63,95,127 ; DNI, ATRUS, GRAPHICS, MAGLEV .byte 16,16,16,96 ; PT3_ENABLE_APPLE_IIC = 1 @@ -226,7 +226,7 @@ PT3_ENABLE_APPLE_IIC = 1 .include "pt3_lib_mockingboard_patch.s" .include "hardware_detect.s" .include "gr_page_flip.s" - + .include "wipes/fx.hgr.fizzle.s" .include "start.s" diff --git a/demos/driven/part10_graphics/wipes/fx.hgr.center.by.pixel.s b/demos/driven/wipes/fx.hgr.center.by.pixel.s similarity index 100% rename from demos/driven/part10_graphics/wipes/fx.hgr.center.by.pixel.s rename to demos/driven/wipes/fx.hgr.center.by.pixel.s diff --git a/demos/driven/part10_graphics/wipes/fx.hgr.fizzle.s b/demos/driven/wipes/fx.hgr.fizzle.s similarity index 100% rename from demos/driven/part10_graphics/wipes/fx.hgr.fizzle.s rename to demos/driven/wipes/fx.hgr.fizzle.s