mirror of
https://github.com/deater/dos33fsprogs.git
synced 2024-12-26 11:30:12 +00:00
fireworks: hgr vapor lock
had various timing errors plus some nops that weren't
This commit is contained in:
Vince Weaver
parent
8d64914eb4
commit
d732fe8ed2
@ -1,6 +1,6 @@
|
||||
; Display fancy Fireworks
|
||||
|
||||
; Uses the 40x48d page1/page2 every-1-scanline pageflip mode
|
||||
; HGR plus 40x48d page1/page2 every-1-scanline pageflip mode
|
||||
|
||||
; by deater (Vince Weaver) <vince@deater.net>
|
||||
|
||||
@ -47,7 +47,7 @@ HOME = $FC58 ;; Clear the text screen
|
||||
WAIT = $FCA8 ;; delay 1/2(26+27A+5A^2) us
|
||||
|
||||
|
||||
jsr draw_fireworks
|
||||
; jsr draw_fireworks
|
||||
|
||||
;==================================
|
||||
;==================================
|
||||
@ -59,6 +59,7 @@ setup_background:
|
||||
; init screen
|
||||
jsr TEXT
|
||||
jsr HOME
|
||||
jsr hgr
|
||||
bit KEYRESET
|
||||
|
||||
;===================
|
||||
@ -92,7 +93,7 @@ setup_background:
|
||||
bit SET_GR ; 4
|
||||
bit FULLGR ; 4
|
||||
|
||||
jsr wait_until_keypressed
|
||||
; jsr wait_until_keypressed
|
||||
|
||||
|
||||
;=============================
|
||||
@ -117,7 +118,7 @@ setup_background:
|
||||
; GR part
|
||||
bit PAGE0
|
||||
|
||||
jsr wait_until_keypressed
|
||||
; jsr wait_until_keypressed
|
||||
|
||||
|
||||
;==============================
|
||||
@ -315,7 +316,7 @@ bpage1_loop: ; delay 115+(7 loop)+4 (bit)+4(extra)
|
||||
; ========
|
||||
; 4533
|
||||
|
||||
jsr do_nothing ; 6
|
||||
jsr action_stars ; 6
|
||||
|
||||
lda KEYPRESS ; 4
|
||||
bpl no_keypress ; 3
|
||||
@ -352,6 +353,33 @@ loop2:
|
||||
rts ; 6
|
||||
|
||||
|
||||
;=================================
|
||||
; action_stars
|
||||
;=================================
|
||||
; and take 4533-6 = 4527 cycles to do it
|
||||
action_stars:
|
||||
|
||||
jsr draw_stars ; 6+4492 = 4498
|
||||
; 4527 - 4498 = 29
|
||||
|
||||
; Try X=4 Y=1 cycles=27 R2
|
||||
|
||||
nop
|
||||
|
||||
ldy #1 ; 2
|
||||
bloop1:
|
||||
ldx #4 ; 2
|
||||
bloop2:
|
||||
dex ; 2
|
||||
bne bloop2 ; 2nt/3
|
||||
|
||||
dey ; 2
|
||||
bne bloop1 ; 2nt/3
|
||||
|
||||
|
||||
rts ; 6
|
||||
|
||||
|
||||
|
||||
;==================================
|
||||
; HLINE
|
||||
|
||||
408
fireworks/fireworks_orig.s
Normal file
408
fireworks/fireworks_orig.s
Normal file
@ -0,0 +1,408 @@
|
||||
; Display fancy Fireworks
|
||||
|
||||
; Uses the 40x48d page1/page2 every-1-scanline pageflip mode
|
||||
|
||||
; by deater (Vince Weaver) <vince@deater.net>
|
||||
|
||||
; Zero Page
|
||||
FRAMEBUFFER = $00 ; $00 - $0F
|
||||
YPOS = $10
|
||||
YPOS_SIN = $11
|
||||
CH = $24
|
||||
CV = $25
|
||||
GBASL = $26
|
||||
GBASH = $27
|
||||
BASL = $28
|
||||
BASH = $29
|
||||
FRAME = $60
|
||||
BLARGH = $69
|
||||
HGR_COLOR = $E4
|
||||
DRAW_PAGE = $EE
|
||||
LASTKEY = $F1
|
||||
PADDLE_STATUS = $F2
|
||||
TEMP = $FA
|
||||
WHICH = $FB
|
||||
|
||||
; Soft Switches
|
||||
KEYPRESS= $C000
|
||||
KEYRESET= $C010
|
||||
SET_GR = $C050 ; Enable graphics
|
||||
FULLGR = $C052 ; Full screen, no text
|
||||
PAGE0 = $C054 ; Page0
|
||||
PAGE1 = $C055 ; Page1
|
||||
LORES = $C056 ; Enable LORES graphics
|
||||
HIRES = $C057 ; Enable HIRES graphics
|
||||
|
||||
PADDLE_BUTTON0 = $C061
|
||||
PADDL0 = $C064
|
||||
PTRIG = $C070
|
||||
|
||||
; ROM routines
|
||||
;HGR = $F3E2
|
||||
;HPLOT0 = $F457
|
||||
;HGLIN = $F53A
|
||||
;COLORTBL= $F6F6
|
||||
TEXT = $FB36 ;; Set text mode
|
||||
HOME = $FC58 ;; Clear the text screen
|
||||
WAIT = $FCA8 ;; delay 1/2(26+27A+5A^2) us
|
||||
|
||||
|
||||
jsr draw_fireworks
|
||||
|
||||
;==================================
|
||||
;==================================
|
||||
|
||||
|
||||
setup_background:
|
||||
|
||||
;===================
|
||||
; init screen
|
||||
jsr TEXT
|
||||
jsr HOME
|
||||
bit KEYRESET
|
||||
|
||||
;===================
|
||||
; init vars
|
||||
|
||||
lda #0
|
||||
sta DRAW_PAGE
|
||||
|
||||
;=============================
|
||||
; Load graphic page0
|
||||
|
||||
lda #$0c
|
||||
sta BASH
|
||||
lda #$00
|
||||
sta BASL ; load image to $c00
|
||||
|
||||
lda #<bg_final_low
|
||||
sta GBASL
|
||||
lda #>bg_final_low
|
||||
sta GBASH
|
||||
jsr load_rle_gr
|
||||
|
||||
lda #4
|
||||
sta DRAW_PAGE
|
||||
|
||||
jsr gr_copy_to_current ; copy to page1
|
||||
|
||||
; GR part
|
||||
bit PAGE1
|
||||
bit LORES ; 4
|
||||
bit SET_GR ; 4
|
||||
bit FULLGR ; 4
|
||||
|
||||
jsr wait_until_keypressed
|
||||
|
||||
|
||||
;=============================
|
||||
; Load graphic page1
|
||||
|
||||
lda #$0c
|
||||
sta BASH
|
||||
lda #$00
|
||||
sta BASL ; load image to $c00
|
||||
|
||||
lda #<bg_final_high
|
||||
sta GBASL
|
||||
lda #>bg_final_high
|
||||
sta GBASH
|
||||
jsr load_rle_gr
|
||||
|
||||
lda #0
|
||||
sta DRAW_PAGE
|
||||
|
||||
jsr gr_copy_to_current
|
||||
|
||||
; GR part
|
||||
bit PAGE0
|
||||
|
||||
jsr wait_until_keypressed
|
||||
|
||||
|
||||
;==============================
|
||||
; setup graphics for vapor lock
|
||||
;==============================
|
||||
|
||||
; Clear Page0
|
||||
lda #$0
|
||||
sta DRAW_PAGE
|
||||
lda #$44
|
||||
jsr clear_gr
|
||||
|
||||
; Make screen half green
|
||||
lda #$11
|
||||
ldy #24
|
||||
jsr clear_page_loop
|
||||
|
||||
|
||||
;=====================================================
|
||||
; attempt vapor lock
|
||||
; by reading the "floating bus" we can see most recently
|
||||
; written value of the display
|
||||
; we look for $55 (which is the grey line)
|
||||
;=====================================================
|
||||
; See:
|
||||
; Have an Apple Split by Bob Bishop
|
||||
; Softalk, October 1982
|
||||
|
||||
; Challenges: each scan line scans 40 bytes.
|
||||
; The blanking happens at the *beginning*
|
||||
; So 65 bytes are scanned, starting at adress of the line - 25
|
||||
|
||||
; the scan takes 8 cycles, look for 4 repeats of the value
|
||||
; to avoid false positive found if the horiz blanking is mirroring
|
||||
; the line (max 3 repeats in that case)
|
||||
|
||||
vapor_lock_loop: ; first make sure we have all zeroes
|
||||
LDA #$11
|
||||
zxloop:
|
||||
LDX #$04
|
||||
wiloop:
|
||||
CMP $C051
|
||||
BNE zxloop
|
||||
DEX
|
||||
BNE wiloop
|
||||
|
||||
LDA #$44 ; now look for our border color (4 times)
|
||||
zloop:
|
||||
LDX #$04
|
||||
qloop:
|
||||
CMP $C051
|
||||
BNE zloop
|
||||
DEX
|
||||
BNE qloop
|
||||
|
||||
; found first line of black after green, at up to line 26 on screen
|
||||
; so we want roughly 22 lines * 4 = 88*65 = 5720 + 4550 = 10270
|
||||
; - 65 (for the scanline we missed) = 10205 - 12 = 10193
|
||||
|
||||
jsr gr_copy_to_current ; 6+ 9292
|
||||
; 10193 - 9298 = 895
|
||||
; Fudge factor (unknown) -30 = 865
|
||||
|
||||
; GR part
|
||||
bit LORES ; 4
|
||||
bit SET_GR ; 4
|
||||
bit FULLGR ; 4
|
||||
|
||||
; Try X=88 Y=2 cycles=893 R2
|
||||
|
||||
nop
|
||||
ldy #2 ; 2
|
||||
loopA:
|
||||
ldx #88 ; 2
|
||||
loopB:
|
||||
dex ; 2
|
||||
bne loopB ; 2nt/3
|
||||
|
||||
dey ; 2
|
||||
bne loopA ; 2nt/3
|
||||
|
||||
jmp display_loop
|
||||
.align $100
|
||||
|
||||
|
||||
;================================================
|
||||
; Display Loop
|
||||
;================================================
|
||||
; each scan line 65 cycles
|
||||
; 1 cycle each byte (40cycles) + 25 for horizontal
|
||||
; Total of 12480 cycles to draw screen
|
||||
; Vertical blank = 4550 cycles (70 scan lines)
|
||||
; Total of 17030 cycles to get back to where was
|
||||
|
||||
; We want to alternate between page1 and page2 every 65 cycles
|
||||
; vblank = 4550 cycles to do scrolling
|
||||
|
||||
|
||||
; 2 + 48*( (4+2+25*(2+3)) + (4+2+23*(2+3)+4+5)) + 9)
|
||||
; 48*[(6+125)-1] + [(6+115+10)-1]
|
||||
|
||||
display_loop:
|
||||
|
||||
; 152 * 65 = 9880 - 12 = 9868
|
||||
|
||||
bit HIRES ; 4
|
||||
bit PAGE0 ; 4
|
||||
|
||||
; Try X=81 Y=24 cycles=9865 R3
|
||||
|
||||
lda DRAW_PAGE ; 3
|
||||
|
||||
ldy #24 ; 2
|
||||
sloop1:
|
||||
ldx #81 ; 2
|
||||
sloop2:
|
||||
dex ; 2
|
||||
bne sloop2 ; 2nt/3
|
||||
|
||||
dey ; 2
|
||||
bne sloop1 ; 2nt/3
|
||||
|
||||
bit LORES ; 4
|
||||
|
||||
|
||||
;top_loop:
|
||||
;
|
||||
;
|
||||
; ldy #76 ; 2
|
||||
;
|
||||
;outer_loop:
|
||||
;
|
||||
; bit PAGE0 ; 4
|
||||
; ldx #12 ; 65 cycles with PAGE0 ; 2
|
||||
;page0_loop: ; delay 61+bit
|
||||
; dex ; 2
|
||||
; bne page0_loop ; 2/3
|
||||
|
||||
|
||||
; bit(4) -1(fallthrough) + loop*5 -1(fallthrouh)+4 extra = 61
|
||||
; 5L = 55
|
||||
;
|
||||
; bit PAGE1 ; 4
|
||||
; ldx #11 ; 65 cycles with PAGE1 ; 2
|
||||
; ;
|
||||
;page1_loop: ; delay 115+(7 loop)+4 (bit)+4(extra)
|
||||
; dex ; 2
|
||||
; bne page1_loop ; 2/3
|
||||
;
|
||||
; dey ; 2
|
||||
; bne outer_loop ; 2/3
|
||||
;
|
||||
;
|
||||
;
|
||||
;bottom_loop:
|
||||
|
||||
|
||||
|
||||
ldy #20 ; 2
|
||||
|
||||
bouter_loop:
|
||||
|
||||
bit PAGE0 ; 4
|
||||
ldx #12 ; 65 cycles with PAGE0 ; 2
|
||||
bpage0_loop: ; delay 61+bit
|
||||
dex ; 2
|
||||
bne bpage0_loop ; 2/3
|
||||
|
||||
|
||||
; bit(4) -1(fallthrough) + loop*5 -1(fallthrouh)+4 extra = 61
|
||||
; 5L = 55
|
||||
|
||||
bit PAGE1 ; 4
|
||||
ldx #11 ; 65 cycles with PAGE1 ; 2
|
||||
;
|
||||
bpage1_loop: ; delay 115+(7 loop)+4 (bit)+4(extra)
|
||||
dex ; 2
|
||||
bne bpage1_loop ; 2/3
|
||||
|
||||
dey ; 2
|
||||
bne bouter_loop ; 2/3
|
||||
|
||||
|
||||
|
||||
;======================================================
|
||||
; We have 4550 cycles in the vblank, use them wisely
|
||||
;======================================================
|
||||
; do_nothing should be 4550+1 -2-9 -7= 4533
|
||||
; 4550
|
||||
; +1 fallthrough
|
||||
; -2 ldy at entry
|
||||
; -7 keyboard
|
||||
; -6 jsr
|
||||
; -3 jmp
|
||||
; ========
|
||||
; 4533
|
||||
|
||||
jsr do_nothing ; 6
|
||||
|
||||
lda KEYPRESS ; 4
|
||||
bpl no_keypress ; 3
|
||||
jmp loop_forever
|
||||
no_keypress:
|
||||
|
||||
jmp display_loop ; 3
|
||||
|
||||
loop_forever:
|
||||
jmp loop_forever
|
||||
|
||||
|
||||
;=================================
|
||||
; do nothing
|
||||
;=================================
|
||||
; and take 4533-6 = 4527 cycles to do it
|
||||
do_nothing:
|
||||
|
||||
; Try X=4 Y=174 cycles=4525 R2
|
||||
|
||||
nop ; 2
|
||||
|
||||
ldy #174 ; 2
|
||||
loop1:
|
||||
ldx #4 ; 2
|
||||
loop2:
|
||||
dex ; 2
|
||||
bne loop2 ; 2nt/3
|
||||
|
||||
dey ; 2
|
||||
bne loop1 ; 2nt/3
|
||||
|
||||
|
||||
rts ; 6
|
||||
|
||||
|
||||
|
||||
;==================================
|
||||
; HLINE
|
||||
;==================================
|
||||
|
||||
; Color in A
|
||||
; Y has which line
|
||||
hline:
|
||||
pha ; 3
|
||||
ldx gr_offsets,y ; 4+
|
||||
stx hline_loop+1 ; 4
|
||||
lda gr_offsets+1,y ; 4+
|
||||
clc ; 2
|
||||
adc DRAW_PAGE ; 3
|
||||
sta hline_loop+2 ; 4
|
||||
pla ; 4
|
||||
ldx #39 ; 2
|
||||
hline_loop:
|
||||
sta $5d0,X ; 38 ; 5
|
||||
dex ; 2
|
||||
bpl hline_loop ; 2nt/3
|
||||
rts ; 6
|
||||
|
||||
;==========================
|
||||
; Clear gr screen
|
||||
;==========================
|
||||
; Color in A
|
||||
clear_gr:
|
||||
ldy #46
|
||||
clear_page_loop:
|
||||
jsr hline
|
||||
dey
|
||||
dey
|
||||
bpl clear_page_loop
|
||||
rts
|
||||
|
||||
gr_offsets:
|
||||
.word $400,$480,$500,$580,$600,$680,$700,$780
|
||||
.word $428,$4a8,$528,$5a8,$628,$6a8,$728,$7a8
|
||||
.word $450,$4d0,$550,$5d0,$650,$6d0,$750,$7d0
|
||||
|
||||
|
||||
.include "../asm_routines/gr_unrle.s"
|
||||
.include "../asm_routines/keypress.s"
|
||||
.include "gr_copy.s"
|
||||
.include "random16.s"
|
||||
.include "fw.s"
|
||||
.include "hgr.s"
|
||||
|
||||
background:
|
||||
|
||||
.include "background_final.inc"
|
||||
|
||||
|
||||
@ -524,36 +524,43 @@ explosion:
|
||||
;=============================
|
||||
; Draw the stars
|
||||
;=============================
|
||||
; 7+ 280X + 5
|
||||
; 16 stars = 4492
|
||||
|
||||
draw_stars:
|
||||
; HCOLOR = 3, white (though they are drawn purple)
|
||||
lda #$7f
|
||||
sta HGR_COLOR
|
||||
|
||||
ldy #0
|
||||
lda #$7f ; 2
|
||||
sta HGR_COLOR ; 3
|
||||
ldy #0 ; 2
|
||||
;===========
|
||||
; 7
|
||||
|
||||
star_loop:
|
||||
tya
|
||||
pha
|
||||
tya ; 2
|
||||
pha ; 3
|
||||
|
||||
; HPLOT X,Y
|
||||
; X= (y,x), Y=a
|
||||
|
||||
ldx stars,Y
|
||||
lda stars+1,Y
|
||||
ldy #0
|
||||
ldx stars,Y ; 4+
|
||||
lda stars+1,Y ; 4+
|
||||
ldy #0 ; 2
|
||||
|
||||
jsr hplot0
|
||||
jsr hplot0 ;6+244
|
||||
|
||||
pla
|
||||
tay
|
||||
pla ; 4
|
||||
tay ; 2
|
||||
|
||||
iny
|
||||
iny
|
||||
cpy #NUMSTARS*2
|
||||
bne star_loop
|
||||
iny ; 2
|
||||
iny ; 2
|
||||
cpy #NUMSTARS*2 ; 2
|
||||
|
||||
rts
|
||||
bne star_loop ; 3
|
||||
;============
|
||||
; 279
|
||||
|
||||
; -1
|
||||
rts ; 6
|
||||
|
||||
stars: ; even x so they are purple
|
||||
.byte 28,107, 108, 88, 126, 88, 136, 95
|
||||
|
||||
@ -84,11 +84,10 @@ msktbl: .byte $81,$82,$84,$88,$90,$A0,$C0 ; original
|
||||
|
||||
;====================================================
|
||||
; HPOSN
|
||||
; time = 9 + 61 + 31 + 22 + 42 + 21 + 23 = 209
|
||||
; time = 9 + 61 + 31 + 22 + 42 + 22 + 23 = 210
|
||||
|
||||
hposn:
|
||||
; F411
|
||||
; move into expected zp locations
|
||||
; F411: move values into expected zp locations
|
||||
sta HGR_Y ; 3
|
||||
stx HGR_X ; 3
|
||||
sty HGR_X+1 ; 3
|
||||
@ -159,7 +158,7 @@ hposn:
|
||||
; 22
|
||||
|
||||
cpy #0 ; 2
|
||||
beq done_mod ; 3
|
||||
beq done_mod_nop_23 ; 3
|
||||
theres_high:
|
||||
; -1
|
||||
clc ; 2
|
||||
@ -181,22 +180,22 @@ theres_high:
|
||||
;===========================
|
||||
; Y=HIGH,NOR = 23+5 = 28 (14)
|
||||
; Y=HIGH,R = 23+16 = 42
|
||||
; Y=LOW = 5 (37 = 14+23)
|
||||
; Y=LOW = 5 + 37(14+23)= 42
|
||||
|
||||
done_mod_nop_23:
|
||||
inc HGR_HORIZ,X ; (nop) ; 6
|
||||
dec HGR_HORIZ,X ; (nop) ; 6
|
||||
inc HGR_HORIZ ; (nop) ; 5
|
||||
lda HGR_HORIZ ; (nop) ; 3
|
||||
lda HGR_HORIZ ; (nop) ; 3
|
||||
|
||||
ldy HGR_HORIZ ; (nop) ; 3
|
||||
ldy HGR_HORIZ ; (nop) ; 3
|
||||
ldy HGR_HORIZ ; (nop) ; 3
|
||||
nop ; 2
|
||||
done_mod_nop14:
|
||||
inc HGR_HORIZ,X ; (nop) ; 6
|
||||
dec HGR_HORIZ,X ; (nop) ; 6
|
||||
nop ; 2
|
||||
|
||||
done_mod:
|
||||
ldy HGR_HORIZ ; 2
|
||||
ldy HGR_HORIZ ; 3
|
||||
tax ; 2
|
||||
lda msktbl,x ; 4+
|
||||
|
||||
@ -206,7 +205,7 @@ done_mod:
|
||||
lda HGR_COLOR ; 3
|
||||
sta HGR_BITS ; 3
|
||||
;===========
|
||||
; 21
|
||||
; 22
|
||||
|
||||
bcs color_shift ; 3
|
||||
; cs = 3+20
|
||||
@ -221,17 +220,22 @@ done_mod:
|
||||
rts ; 6
|
||||
;===========
|
||||
; 23
|
||||
|
||||
;=====================================
|
||||
; HPLOT0
|
||||
; point in (YX),A
|
||||
; 244 cycles
|
||||
hplot0:
|
||||
; F457
|
||||
jsr hposn ; 6+209
|
||||
jsr hposn ; 6+210
|
||||
lda HGR_BITS ; 3
|
||||
eor (GBASL),y ; 5
|
||||
eor (GBASL),y ; 5+
|
||||
and HMASK ; 3
|
||||
eor (GBASL),y ; 5
|
||||
sta (GBASL),y ; 5
|
||||
eor (GBASL),y ; 5+
|
||||
sta (GBASL),y ; 6
|
||||
rts ; 6
|
||||
;============
|
||||
; 242
|
||||
; 244
|
||||
|
||||
move_left_or_right:
|
||||
; F465
|
||||
|
||||
Loading…
Reference in New Issue
Block a user