Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2024-12-27 02:31:00 +00:00
Code Issues Projects Releases Wiki Activity

ootw: c15: shots do wall damage

Browse Source
This commit is contained in:
Vince Weaver 2020-02-10 13:06:33 -05:00
parent 5f4fc26b16
commit 512365a310
2 changed files with 49 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
ootw/gr_trapezoid.s
View File

@ -10,7 +10,7 @@
; .byte END_X_H,END_X_L
; .byte END_Y,START_Y
; if START_Y=$ff then draw bullet-hole on background at left_slopeh/l
; color is trapezoid_color_smc+1, usually it's going to be #$11 (red)
@ -20,37 +20,19 @@ draw_trapezoid:
; FIXME: make this a loop
ldy #0
trapezoid_load_loop:
lda (INL),Y
sta trapezoid_left_slope
iny
lda (INL),Y
sta trapezoid_left_slope+1
iny
lda (INL),Y
sta trapezoid_right_slope
iny
lda (INL),Y
sta trapezoid_right_slope+1
iny
lda (INL),Y
sta trapezoid_x_start
iny
lda (INL),Y
sta trapezoid_x_start+1
iny
lda (INL),Y
sta trapezoid_x_end
iny
lda (INL),Y
sta trapezoid_x_end+1
iny
lda (INL),Y
sta trapezoid_endy_smc+1
sta trapezoid_left_slope,Y
iny
cpy #8
bne trapezoid_load_loop
lda (INL),Y
sta trapezoid_endy_smc+1
iny
lda (INL),Y
tay
bmi draw_bullethole
draw_trapezoid_loop:
@ -101,13 +83,37 @@ trapezoid_endy_smc:
rts
draw_bullethole:
ldy trapezoid_left_slope+1 ; get Y value
lda gr_offsets,Y
clc
adc trapezoid_left_slope
sta bullethole_draw_loop_smc+1
lda gr_offsets+1,Y
clc
adc #$8 ; to background page $c00?
sta bullethole_draw_loop_smc+2
bullethole_draw:
ldy #3
bullethole_draw_loop:
lda #$66
bullethole_draw_loop_smc:
sta $c00,Y
dey
bne bullethole_draw_loop
rts
trapezoid_x_start:
.byte 0,0
trapezoid_left_slope:
.byte 0,0
trapezoid_x_end:
.byte 0,0
trapezoid_right_slope:
.byte 0,0
trapezoid_x_start:
.byte 0,0
trapezoid_x_end:
.byte 0,0

66
ootw/ootw_c15.s
View File

@ -563,7 +563,8 @@ c15_room1_foreground:
; test shots
lda FRAMEL
and #$0c
and #$18
lsr
lsr
tay
@ -572,54 +573,8 @@ c15_room1_foreground:
lda shot_lookup+1,Y
sta INH
; lda #<shot1_frame1
; sta INL
; lda #>shot1_frame1
; sta INH
; ldy #46
; lda #36
; sta trapezoid_endy_smc+1
; lda #0
; sta trapezoid_x_start+1
; sta trapezoid_x_end+1
; lda #2
; sta trapezoid_x_start
; lda #15
; sta trapezoid_x_end
; lda #2
; sta trapezoid_left_slope
; lda #128
; sta trapezoid_left_slope+1
; lda #0
; sta trapezoid_right_slope
; lda #128
; sta trapezoid_right_slope+1
jsr draw_trapezoid
; shot2
; startx = 3
; endx = 14.5
; left_slope = 2.0 0 1 0 0 1
; right_slope = 0.33 0.66 1.00 1.33 1.66 1.99
; starty=46, endy=30
; 1/2 1/4 1/8
; 0.33 in binary = .0 1 1 .25+.125=.375
; shot3
; startx = 17, endx=19
; left_slope=2
; right_slope=2
; starty=32, endy=28
; Room 5 friend slowly working to left
@ -917,7 +872,7 @@ shot_lookup:
.word shot1_frame1
.word shot1_frame2
.word shot1_frame3
.word shot1_frame3
.word shot1_hole
shot1_frame1:
@ -928,17 +883,20 @@ shot1_frame1:
.byte 36,46 ; ENDY/STARTY
shot1_frame2:
.byte 2,0 ; LEFT SLOPE H/L
.byte 0,$60 ; RIGHT SLOPE H/L
; .byte 0,$60 ; RIGHT SLOPE H/L ; approximately 1/3?
.byte 0,$80 ; RIGHT SLOPE H/L ; approximately 1/3?
.byte 3,0 ; STARTX H/L
.byte 14,128 ; ENDX H/L
.byte 32,46 ; ENDY/STARTY
.byte 30,46 ; ENDY/STARTY
shot1_frame3:
.byte 2,0 ; LEFT SLOPE H/L
.byte 2,0 ; RIGHT SLOPE H/L
.byte 17,0 ; STARTX H/L
.byte 19,9 ; ENDX H/L
.byte 28,32 ; ENDY/STARTY
shot1_hole:
.byte 18,28 ; LEFT SLOPE H/L
.byte 0,0 ; RIGHT SLOPE H/L
.byte 0,0 ; STARTX H/L
.byte 0,0 ; ENDX H/L
.byte 0,$ff ; ENDY/STARTY