driven: starting to combine code

This commit is contained in:
Vince Weaver 2024-11-10 01:46:46 -05:00
parent de8085a20a
commit 50cc9523fe
9 changed files with 80 additions and 24 deletions

View File

@ -93,6 +93,7 @@ qload.inc: generate_common QLOAD
./generate_common -a 0x1200 -s zx02_full_decomp qload.lst >> qload.inc
./generate_common -a 0x1200 -s zx_src_h qload.lst >> qload.inc
./generate_common -a 0x1200 -s zx_src_l qload.lst >> qload.inc
./generate_common -a 0x1200 -s wait_until_keypress qload.lst >> qload.inc
####

View File

@ -1,5 +1,18 @@
Disk Usage:
QLOAD: can be up to 4k, have room
maybe put hires lookup tables at $c00?
INTRO = 10k, unlikely to get much bigger
MUSIC = 9k
DNI = 4k (actually less, merge in with music?)
ATRUS = 10k or so
CREDITS = 8k or so
GRAPHICS = 16k
MAGLEV = 32k
Disk1 Map (disk has 35 tracks, each 4k in size)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
T 0 = Qboot / SAVES
@ -8,7 +21,7 @@ T 4 = MUSIC 4803 bytes 5T (?) 0k free
T 9 = INTRO ? bytes 4T (16384) 3k free
T 13 = CREDITS ? bytes 4T (16384) 1k free
T 17 = DNI ? bytes 4T (16384)
T 21 = SCROLL ? bytes 4T (16384)
T 21 = ATRUS ? bytes 4T (16384)
T 25 = GRAPHICS ? bytes 4T
note: below is not accurate

View File

@ -277,7 +277,7 @@ masks_reverse:
.byte $C0,$E0,$F0,$F8,$FC,$FE,$FF
.include "erase.s"
.include "../wait_keypress.s"
;.include "../wait_keypress.s"
.include "graphics/d_sprites.inc"

View File

@ -120,7 +120,7 @@ atrus_text:
.byte 4,22,"I need... Wait, is this a demo?",0
.byte 9,23,"Sorry let me try again",0
.include "../wait_keypress.s"
;.include "../wait_keypress.s"
.include "plasma.s"

View File

@ -121,7 +121,11 @@ skip_first_col:
cpy #40 ; see if Y edge of screen
bcc do_scroll_loop
; FIXME: also check keyboard
;=====================
; check keyboard
lda KEYPRESS
bmi do_scroll_done
lda #200
jsr wait
@ -139,7 +143,7 @@ jmp_scroll_again:
jmp do_scroll_again
do_scroll_done:
bit KEYRESET
rts
scroll_text: ;0123456789012345678901234567890123456789

View File

@ -70,13 +70,18 @@ graphics:
rts
floater_graphics:
.incbin "graphics/floater_wide_steffest.hgr.zx02"
; .incbin "graphics/floater_wide_steffest.hgr.zx02"
; .incbin "graphics/a2_atrus.hgr.zx02"
; .incbin "graphics/atrus_iipix.hgr.zx02"
.incbin "graphics/atrus_light_iipix.hgr.zx02"
riven_233_graphics_aux:
.incbin "graphics/riven_233.aux.zx02"
; .incbin "graphics/riven_233.aux.zx02"
.incbin "graphics/atrus.aux.zx02"
riven_233_graphics_bin:
.incbin "graphics/riven_233.bin.zx02"
; .incbin "graphics/riven_233.bin.zx02"
.incbin "graphics/atrus.bin.zx02"
.include "../wait_keypress.s"
;.include "../wait_keypress.s"

View File

@ -7,7 +7,10 @@ PNG2GR = ../../../../utils/gr-utils/png2gr
HGR_SPRITE = ../../../../utils/hgr-utils/hgr_make_sprite
all: floater_wide_steffest.hgr.zx02 \
riven_233.aux.zx02 riven_233.bin.zx02
riven_233.aux.zx02 riven_233.bin.zx02 \
a2_atrus.hgr.zx02 \
atrus_iipix.hgr.zx02 atrus_light_iipix.hgr.zx02 \
atrus.aux.zx02 atrus.bin.zx02
####
@ -19,6 +22,45 @@ floater_wide_steffest.hgr: floater_wide_steffest.png
####
a2_atrus.hgr.zx02: a2_atrus.hgr
$(ZX02) a2_atrus.hgr a2_atrus.hgr.zx02
a2_atrus.hgr: a2_atrus.png
$(PNG_TO_HGR) a2_atrus.png > a2_atrus.hgr
####
atrus_iipix.hgr.zx02: atrus_iipix.hgr
$(ZX02) atrus_iipix.hgr atrus_iipix.hgr.zx02
atrus_iipix.hgr: atrus_iipix.png
$(PNG_TO_HGR) atrus_iipix.png > atrus_iipix.hgr
####
atrus_light_iipix.hgr.zx02: atrus_light_iipix.hgr
$(ZX02) atrus_light_iipix.hgr atrus_light_iipix.hgr.zx02
atrus_light_iipix.hgr: atrus_light_iipix.png
$(PNG_TO_HGR) atrus_light_iipix.png > atrus_light_iipix.hgr
####
atrus.aux.zx02: atrus.AUX
$(ZX02) atrus.AUX atrus.aux.zx02
atrus.AUX: atrus_iipix_dhgr.png
$(PNG_TO_DHGR) atrus_iipix_dhgr.png atrus
atrus.bin.zx02: atrus.BIN
$(ZX02) atrus.BIN atrus.bin.zx02
atrus.BIN: atrus_iipix_dhgr.png
$(PNG_TO_DHGR) atrus_iipix_dhgr.png atrus
####
riven_233.aux.zx02: riven_233.AUX
$(ZX02) riven_233.AUX riven_233.aux.zx02

View File

@ -246,17 +246,12 @@ skip_next_text:
jmp scroll_loop
.align $100
.include "../wait_keypress.s"
; .include "../zx02_optim.s"
.include "../hgr_clear_screen.s"
.include "vertical_scroll.s"
.include "font_4am_1x8_oneline.s"
.include "fonts/font_4am_1x8_data.s"
; .include "font_4am_1x10.s"
; .include "fonts/font_4am_1x10_data.s"
.include "../irq_wait.s"
.include "../hgr_page_flip.s"

View File

@ -496,13 +496,9 @@ load_program_loop2:
forever:
jmp forever
;.align $100
.include "wait_keypress.s"
.include "zx02_optim.s"
.include "gs_interrupt.s"
.include "pt3_lib_mockingboard_patch.s"
.include "hardware_detect.s"
.include "wait_keypress.s"
.include "zx02_optim.s"
.include "gs_interrupt.s"
.include "pt3_lib_mockingboard_patch.s"
.include "hardware_detect.s"