ds: in search of 32k

This commit is contained in:
Vince Weaver 2019-11-15 22:43:44 -05:00
parent 416d85aacf
commit 2b845101f9
6 changed files with 16 additions and 17 deletions

View File

@ -7,14 +7,14 @@ PNG_TO_40x96 = ../gr-utils/png_to_40x96
PNG_TO_40x48D = ../gr-utils/png_to_40x48d
B2D = ../bmp2dhr/b2d
all: demosplash.dsk
all: demosplash2019.dsk
demosplash.dsk: HELLO LOADER DEMOSPLASH
cp empty.dsk demosplash.dsk
$(DOS33) -y demosplash.dsk SAVE A HELLO
$(DOS33) -y demosplash.dsk BSAVE -a 0x1000 LOADER
$(DOS33) -y demosplash.dsk BSAVE -a 0x1400 DEMOSPLASH
# $(DOS33) -y demosplash.dsk BSAVE -a 0x1700 MUSICTEST
demosplash2019.dsk: HELLO LOADER DEMOSPLASH
cp empty.dsk demosplash2019.dsk
$(DOS33) -y demosplash2019.dsk SAVE A HELLO
$(DOS33) -y demosplash2019.dsk BSAVE -a 0x1000 LOADER
$(DOS33) -y demosplash2019.dsk BSAVE -a 0x1400 DEMOSPLASH
# $(DOS33) -y demosplash2019.dsk BSAVE -a 0x1700 MUSICTEST
####

View File

@ -211,7 +211,7 @@ credits_loop:
; 3+2+3+6+1237 play fake (-1)
lda FRAME_PLAY_PAGE ; 3
cmp #$8 ; 2 ; FIXME
cmp #$A ; 2 ; FIXME
beq play_fake ; 3
; -1
play_actual:

View File

@ -182,17 +182,20 @@ repeat_ending:
.include "credits_bg.inc"
.include "delay_a.s" ; critical
; things that are exactly 1 page in size
.align $100
.include "offsets_table.s"
.include "movement_table.s"
random_values:
.incbin "random.data"
.include "offsets_table2.s"
.include "font.s"
; things that need to not cross pages
.include "vapor_lock.s"
.include "delay_a.s"
.include "gr_unrle.s"
.include "gr_copy.s"
.include "gr_unrle.s"
.include "gr_offsets.s"
.include "gr_pageflip.s"
.include "gr_clear_bottom.s"

View File

@ -1490,15 +1490,9 @@ erase_fire:
; 11
.align $100
random_values:
.incbin "random.data"
.include "offsets_table2.s"
.include "text_print.s"
.align $100
.include "gr_putsprite_fast.s"
;.assert >gr_offsets = >gr_offsets_done, error, "gr_offsets crosses page"
.assert >escape_wait_loop = >(escape_wait_loop_end-1), error, "escape_wait_loop crosses page"
.align $100

View File

@ -2,7 +2,7 @@
10 PRINT "LOADING LORES-ESCAPE, DEMOSPLASH 2019"
20 PRINT
30 PRINT "NOTE: ON REAL HARDWARE THIS MAY"
40 PRINT " TAKE A WHILE (45s?)"
40 PRINT " TAKE A WHILE (45 SECONDS)"
' 200 PRINT CHR$ (4)"CATALOG"
200 PRINT CHR$ (4)"BRUN LOADER"

View File

@ -147,6 +147,8 @@ music_addr_table:
.byte $1F,$20,$21,$22,$23,$24,$25,$26,$27,$28,$29,$BB,$CC,$DD,$EE,$FF ;5
.byte $2A,$2B,$2C,$2D,$2E,$2F,$30,$31,$32,$33,$34,$BB,$CC,$DD,$EE,$FF ;6
.byte $35,$36,$37,$38,$39,$3A,$3B,$3C,$3D,$3E,$3F,$BB,$CC,$DD,$EE,$FF ;7
.byte $2A,$2B,$2C,$2D,$2E,$2F,$30,$31,$32,$33,$34,$BB,$CC,$DD,$EE,$FF ;6
.byte $35,$36,$37,$38,$39,$3A,$3B,$3C,$3D,$3E,$3F,$BB,$CC,$DD,$EE,$FF ;7
;.byte $d0,$d1,$d2,$d3,$d4,$d5,$d6,$d7,$d8,$d9,$da,$BB,$CC,$DD,$EE,$FF
music_table_end: