Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2024-06-13 03:29:32 +00:00
Code Issues Projects Releases Wiki Activity

xmas2018: turn all flames back on

Browse Source
This commit is contained in:
Vince Weaver 2018-12-18 14:57:44 -05:00
parent c82b4c8bdb
commit 81739275f3
3 changed files with 24 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xmas_2018/README
View File

@ -18,3 +18,4 @@ SIZE:
3647 -- use LZ4 encryption on scroll text
3903 -- add in support for all 5 candles
3647 -- make sprites non-transparent
3903 -- turn all flames back on

42
xmas_2018/sprites.inc
View File

@ -4,16 +4,13 @@ wide_empty:
.byte $00,$00
.byte $00,$00
.byte $00,$00
; = 33 + Y*(51+31*X) = 33 + 3*(51+62) = 372
wide_flame0:
.byte $2,$3
.byte $dd,$dd
.byte $dd,$dd
.byte $dd,$dd
; 00=0 0X=0 X0=0 XX=6
; = 33 + Y*(52)+ [30A + 64B + 69C + 54D]-Y
; = 33 + 3*52 + 30*0 + 64*0 + 69*0 + 54*6 - 3
; = 510
; = 33 + Y*(51+31*X) = 33 + 3*(51+62) = 372
wide_flame1:
@ -21,77 +18,56 @@ wide_flame1:
.byte $dd,$dd
.byte $dd,$dd
.byte $9d,$9d
; 00=0 0X=0 X0=0 XX=6
; = 33 + Y*(52)+ [30A + 64B + 69C + 54D]-Y
; = 33 + 3*52 + 30*0 + 64*0 + 69*0 + 54*6 - 3
; = 510
; = 33 + Y*(51+31*X) = 33 + 3*(51+62) = 372
wide_flame2:
.byte $2,$3
.byte $dd,$dd
.byte $dd,$dd
.byte $99,$99
; 00=0 0X=0 X0=0 XX=6
; = 33 + Y*(52)+ [30A + 64B + 69C + 54D]-Y
; = 33 + 3*52 + 30*0 + 64*0 + 69*0 + 54*6 - 3
; = 510
; = 33 + Y*(51+31*X) = 33 + 3*(51+62) = 372
wide_flame3:
.byte $2,$3
.byte $dd,$dd
.byte $dd,$dd
.byte $d9,$d9
; 00=0 0X=0 X0=0 XX=6
; = 33 + Y*(52)+ [30A + 64B + 69C + 54D]-Y
; = 33 + 3*52 + 30*0 + 64*0 + 69*0 + 54*6 - 3
; = 510
; = 33 + Y*(51+31*X) = 33 + 3*(51+62) = 372
empty:
.byte $1,$3
.byte $00
.byte $00
.byte $00
; = 33 + Y*(51+31*X) = 33 + 3*(51+31) = 279
flame0:
.byte $1,$3
.byte $dd
.byte $dd
.byte $dd
; 00=0 0X=0 X0=0 XX=3
; = 33 + Y*(52)+ [30A + 64B + 69C + 54D]-Y
; = 33 + 3*52 + 30*0 + 64*0 + 69*0 + 54*3 - 3
; = 348
; = 33 + Y*(51+31*X) = 33 + 3*(51+31) = 279
flame1:
.byte $1,$3
.byte $dd
.byte $dd
.byte $99
; 00=0 0X=0 X0=0 XX=3
; = 33 + Y*(52)+ [30A + 64B + 69C + 54D]-Y
; = 33 + 3*52 + 30*0 + 64*0 + 69*0 + 54*3 - 3
; = 348
; = 33 + Y*(51+31*X) = 33 + 3*(51+31) = 279
flame2:
.byte $1,$3
.byte $dd
.byte $dd
.byte $d9
; 00=0 0X=0 X0=0 XX=3
; = 33 + Y*(52)+ [30A + 64B + 69C + 54D]-Y
; = 33 + 3*52 + 30*0 + 64*0 + 69*0 + 54*3 - 3
; = 348
; = 33 + Y*(51+31*X) = 33 + 3*(51+31) = 279
flame3:
.byte $1,$3
.byte $dd
.byte $dd
.byte $9d
; 00=0 0X=0 X0=0 XX=3
; = 33 + Y*(52)+ [30A + 64B + 69C + 54D]-Y
; = 33 + 3*52 + 30*0 + 64*0 + 69*0 + 54*3 - 3
; = 348
; = 33 + Y*(51+31*X) = 33 + 3*(51+31) = 279
wide_lookup:
.byte >wide_flame0,>wide_flame1,>wide_flame2,>wide_flame3

32
xmas_2018/wreath.s
View File

@ -120,13 +120,12 @@ wrloopF:dex ; 2
; do_nothing should be 4550
; play music 1023
; sprites (536*3+374*2) = ;2356
; 398
; sprites (398*3+305*2) = 1804
; -18 frame adjust
; -7 end detect
; -10 keypress
; ===========
; 1136
; 1688
@ -174,7 +173,6 @@ done_wframing:
jsr put_sprite_no_transparency ; 6+372
;===============
; 398
.if 0
; Candle 2 (Peace)
lda #>flame0 ; 2
@ -186,9 +184,9 @@ done_wframing:
sta XPOS ; 3
lda #4 ; 2
sta YPOS ; 3
jsr put_sprite_no_transparency ; 6+348
jsr put_sprite_no_transparency ; 6+279
;===============
; 374
; 305
; Candle 3 (Joy)
@ -201,24 +199,24 @@ done_wframing:
sta XPOS ; 3
lda #4 ; 2
sta YPOS ; 3
jsr put_sprite_no_transparency ; 6+348
jsr put_sprite_no_transparency ; 6+279
;===============
; 374
; 305
; Candle 4 (Love)
lda #>wide_flame1 ; 2
sta INH ; 3
lda #<wide_flame0 ; 2
lda #<wide_flame1 ; 2
sta INL ; 3
lda #26 ; 2
sta XPOS ; 3
lda #4 ; 2
sta YPOS ; 3
jsr put_sprite_no_transparency ; 6+510
jsr put_sprite_no_transparency ; 6+372
;===============
; 536
; 398
; Candle 5 (Christmas)
@ -231,16 +229,14 @@ done_wframing:
sta XPOS ; 3
lda #4 ; 2
sta YPOS ; 3
jsr put_sprite_no_transparency ; 6+510
jsr put_sprite_no_transparency ; 6+372
;===============
; 536
.endif
; 398
; Try X=225 Y=1 cycles=1132 R4
; Try X=205 Y=3 cycles=3094
; Try X=47 Y=7 cycles=1688
ldy #3 ; 2
wrloop1:ldx #205 ; 2
ldy #7 ; 2
wrloop1:ldx #47 ; 2
wrloop2:dex ; 2
bne wrloop2 ; 2nt/3
dey ; 2