mirror of
https://github.com/a2-4am/4cade.git
synced 2024-12-23 16:29:34 +00:00
add fx/sunset, fx/radial2, fx/radial3, fx/radial4, fx/radial5
This commit is contained in:
parent
05ac8136f3
commit
d124019918
5
Makefile
5
Makefile
@ -43,7 +43,12 @@ asm: md
|
||||
$(ACME) src/fx/fx.hgr.stagger.lr.white.a
|
||||
$(ACME) src/fx/fx.hgr.corner.circle.a
|
||||
$(ACME) src/fx/fx.hgr.sunrise.a
|
||||
$(ACME) src/fx/fx.hgr.sunset.a
|
||||
$(ACME) src/fx/fx.hgr.radial.a
|
||||
$(ACME) src/fx/fx.hgr.radial2.a
|
||||
$(ACME) src/fx/fx.hgr.radial3.a
|
||||
$(ACME) src/fx/fx.hgr.radial4.a
|
||||
$(ACME) src/fx/fx.hgr.radial5.a
|
||||
$(ACME) src/fx/fx.hgr.split.ud.intro.a
|
||||
$(ACME) src/fx/fx.hgr.iris.a
|
||||
$(ACME) src/fx/fx.hgr.ripple.a
|
||||
|
@ -1 +1 @@
|
||||
#
# transition effects for HGR slideshows
#
FOURSPIRAL
STAR
RIPPLE
IRIS
SPLIT.UD.INTRO
RADIAL
SUNRISE
DIAGONAL
CHECKERBOARD
HALF.FIZZLE
CORNER.CIRCLE
BAR.DISSOLVE
STAGGERWHITE.LR
DIAMOND
ONESQUARE
TWOPASS.LR
CRYSTAL
HALF.MOSAIC
STAGGER.LR
FOURSQUARE
STAGGER.UD
INTERLOCK.LR
BLOCK.MOSAIC
FIZZLE
STAGGERWHITE.UD
INTERLOCK.UD
BLOCK.FIZZLE
SPIRAL
[eof]
|
||||
#
# transition effects for HGR slideshows
#
SUNRISE
SUNSET
RADIAL
RADIAL2
RADIAL3
RADIAL4
RADIAL5
FOURSPIRAL
STAR
RIPPLE
IRIS
SPLIT.UD.INTRO
DIAGONAL
CHECKERBOARD
HALF.FIZZLE
CORNER.CIRCLE
BAR.DISSOLVE
STAGGERWHITE.LR
DIAMOND
ONESQUARE
TWOPASS.LR
CRYSTAL
HALF.MOSAIC
STAGGER.LR
FOURSQUARE
STAGGER.UD
INTERLOCK.LR
BLOCK.MOSAIC
FIZZLE
STAGGERWHITE.UD
INTERLOCK.UD
BLOCK.FIZZLE
SPIRAL
[eof]
|
@ -20,7 +20,12 @@ STAGGER.LR=Type(06),AuxType(6000),Access(C3)
|
||||
STAGGERWHITE.LR=Type(06),AuxType(6000),Access(C3)
|
||||
CORNER.CIRCLE=Type(06),AuxType(6000),Access(C3)
|
||||
SUNRISE=Type(06),AuxType(6000),Access(C3)
|
||||
SUNSET=Type(06),AuxType(6000),Access(C3)
|
||||
RADIAL=Type(06),AuxType(6000),Access(C3)
|
||||
RADIAL2=Type(06),AuxType(6000),Access(C3)
|
||||
RADIAL3=Type(06),AuxType(6000),Access(C3)
|
||||
RADIAL4=Type(06),AuxType(6000),Access(C3)
|
||||
RADIAL5=Type(06),AuxType(6000),Access(C3)
|
||||
SPLIT.UD.INTRO=Type(06),AuxType(6000),Access(C3)
|
||||
IRIS=Type(06),AuxType(6000),Access(C3)
|
||||
RIPPLE=Type(06),AuxType(6000),Access(C3)
|
||||
|
@ -1,49 +0,0 @@
|
||||
0123456789012345678901234567890123456789
|
||||
0AAAAA AAAAA AAAAA AAAAA .
|
||||
1 .
|
||||
2 .
|
||||
3 .
|
||||
4 .
|
||||
5 AAAAA AAAAA AAAAA AAAAA.
|
||||
6AAAAA .
|
||||
7 .
|
||||
8 .
|
||||
9 .
|
||||
0 .
|
||||
1 .
|
||||
2AAAAA .
|
||||
3 .
|
||||
4 .
|
||||
5 .
|
||||
6 .
|
||||
7 .
|
||||
8AAAAA .
|
||||
9 .
|
||||
0 .
|
||||
1 .
|
||||
2 .
|
||||
3 .
|
||||
4AAAAA .
|
||||
5 .
|
||||
6 .
|
||||
7 .
|
||||
8 .
|
||||
9 .
|
||||
0AAAAA .
|
||||
1 .
|
||||
2 .
|
||||
3 .
|
||||
4 .
|
||||
5 .
|
||||
6AAAAA .
|
||||
7 .
|
||||
8 .
|
||||
9 .
|
||||
0 .
|
||||
1 .
|
||||
2AAAAA .
|
||||
3 .
|
||||
4 .
|
||||
5 .
|
||||
6 .
|
||||
7 .
|
@ -25,16 +25,66 @@ for i in range(300, 0, -1):
|
||||
if any:
|
||||
coords.append((255,255))
|
||||
|
||||
q1 = coords.copy()
|
||||
q2 = [(-x-1,y) for x,y in coords]
|
||||
q2.reverse()
|
||||
q3 = [(-x-1,-y-1) for x,y in coords]
|
||||
q4 = [(x,-y-1) for x,y in coords]
|
||||
q4.reverse()
|
||||
coords = q4 + coords + q2 + q3
|
||||
|
||||
coords = q4 + q1 + q2 + q3
|
||||
with open("../../src/fx/fx.hgr.radial.data.a", "w") as f:
|
||||
for x, y in coords:
|
||||
if x not in range(-40,40):
|
||||
f.write(" !byte 255,255\n")
|
||||
else:
|
||||
f.write(" !byte %s,%s\n" % ((23-y,19-x)))
|
||||
|
||||
coords = []
|
||||
for cs in list(zip(q1,q3)) + list(zip(q2,q4)):
|
||||
for c in cs:
|
||||
coords.append(c)
|
||||
with open("../../src/fx/fx.hgr.radial2.data.a", "w") as f:
|
||||
for x, y in coords:
|
||||
if x not in range(-40,40):
|
||||
f.write(" !byte 255,255\n")
|
||||
else:
|
||||
f.write(" !byte %s,%s\n" % ((23-y,19-x)))
|
||||
|
||||
coords = []
|
||||
for cs in zip(q1,q2,q3,q4):
|
||||
for c in cs:
|
||||
coords.append(c)
|
||||
with open("../../src/fx/fx.hgr.radial3.data.a", "w") as f:
|
||||
for x, y in coords:
|
||||
if x not in range(-40,40):
|
||||
f.write(" !byte 255,255\n")
|
||||
else:
|
||||
f.write(" !byte %s,%s\n" % ((23-y,19-x)))
|
||||
|
||||
q1.reverse()
|
||||
q3.reverse()
|
||||
coords = []
|
||||
for cs in zip(q1,q2,q3,q4):
|
||||
for c in cs:
|
||||
coords.append(c)
|
||||
with open("../../src/fx/fx.hgr.radial4.data.a", "w") as f:
|
||||
for x, y in coords:
|
||||
if x not in range(-40,40):
|
||||
f.write(" !byte 255,255\n")
|
||||
else:
|
||||
f.write(" !byte %s,%s\n" % ((23-y,19-x)))
|
||||
|
||||
q1.reverse()
|
||||
q2.reverse()
|
||||
q3.reverse()
|
||||
q4.reverse()
|
||||
coords = []
|
||||
for cs in zip(q1,q2,q3,q4):
|
||||
for c in cs:
|
||||
coords.append(c)
|
||||
with open("../../src/fx/fx.hgr.radial5.data.a", "w") as f:
|
||||
for x, y in coords:
|
||||
if x not in range(-40,40):
|
||||
f.write(" !byte 255,255\n")
|
||||
else:
|
||||
f.write(" !byte %s,%s\n" % ((23-y,19-x)))
|
||||
|
@ -33,3 +33,11 @@ with open("../../src/fx/fx.hgr.sunrise.data.a", "w") as f:
|
||||
f.write(" !byte 255,255\n")
|
||||
else:
|
||||
f.write(" !byte %s,%s\n" % (47-y,39-x))
|
||||
|
||||
coords.reverse()
|
||||
with open("../../src/fx/fx.hgr.sunset.data.a", "w") as f:
|
||||
for x, y in coords:
|
||||
if x == 255:
|
||||
f.write(" !byte 255,255\n")
|
||||
else:
|
||||
f.write(" !byte %s,%s\n" % (47-y,39-x))
|
||||
|
@ -193,7 +193,7 @@ AttractMode
|
||||
jmp BlankHGR
|
||||
|
||||
@HGRSlideshow
|
||||
jsr LoadTransition
|
||||
; jsr LoadTransition
|
||||
jsr okvs_iter
|
||||
!word gSlideshowStore
|
||||
!word HGRLoad
|
||||
@ -209,7 +209,7 @@ HGRLoad
|
||||
; load HGR screenshot at $4000
|
||||
+LOAD_FILE kHGRScreenshotDirectory, PTR
|
||||
|
||||
; jsr LoadTransition
|
||||
jsr LoadTransition
|
||||
jsr $6000 ; transition effect code was loaded here earlier
|
||||
jmp WaitOnScreenshot
|
||||
|
||||
|
@ -2,39 +2,7 @@
|
||||
!to "build/FX/RADIAL",plain
|
||||
*=$6000
|
||||
|
||||
coord = $FE
|
||||
|
||||
lda #<@coords
|
||||
sta coord
|
||||
lda #>@coords
|
||||
sta coord+1
|
||||
ldy #0
|
||||
@loop
|
||||
lda (coord),y
|
||||
bpl @copy
|
||||
lda #$6
|
||||
jsr WaitForKeyWithTimeout
|
||||
bmi @exit
|
||||
bpl @next ; always branches
|
||||
@copy
|
||||
tax
|
||||
iny
|
||||
lda (coord),y
|
||||
tay
|
||||
txa
|
||||
jsr HGRHalfBlockCopy
|
||||
@next
|
||||
inc coord
|
||||
bne +
|
||||
inc coord+1
|
||||
+ inc coord
|
||||
bne +
|
||||
inc coord+1
|
||||
+ ldy #$00
|
||||
lda ($FE),y
|
||||
cmp #$80
|
||||
bne @loop
|
||||
@exit rts
|
||||
!source "src/fx/fx.hgr.radial.common.a"
|
||||
|
||||
@coords
|
||||
!source "src/fx/fx.hgr.radial.data.a"
|
||||
|
33
src/fx/fx.hgr.radial.common.a
Normal file
33
src/fx/fx.hgr.radial.common.a
Normal file
@ -0,0 +1,33 @@
|
||||
coord = $FE
|
||||
|
||||
lda #<@coords
|
||||
sta coord
|
||||
lda #>@coords
|
||||
sta coord+1
|
||||
ldy #0
|
||||
@loop
|
||||
lda (coord),y
|
||||
bpl @copy
|
||||
lda #$6
|
||||
jsr WaitForKeyWithTimeout
|
||||
bmi @exit
|
||||
bpl @next ; always branches
|
||||
@copy
|
||||
tax
|
||||
iny
|
||||
lda (coord),y
|
||||
tay
|
||||
txa
|
||||
jsr HGRHalfBlockCopy
|
||||
@next
|
||||
inc coord
|
||||
bne +
|
||||
inc coord+1
|
||||
+ inc coord
|
||||
bne +
|
||||
inc coord+1
|
||||
+ ldy #$00
|
||||
lda ($FE),y
|
||||
cmp #$80
|
||||
bne @loop
|
||||
@exit rts
|
12
src/fx/fx.hgr.radial2.a
Normal file
12
src/fx/fx.hgr.radial2.a
Normal file
@ -0,0 +1,12 @@
|
||||
!cpu 6502
|
||||
!to "build/FX/RADIAL2",plain
|
||||
*=$6000
|
||||
|
||||
!source "src/fx/fx.hgr.radial.common.a"
|
||||
|
||||
@coords
|
||||
!source "src/fx/fx.hgr.radial2.data.a"
|
||||
!byte $80
|
||||
|
||||
!source "src/wait.a"
|
||||
!source "src/fx/fx.hgr.common.a"
|
2764
src/fx/fx.hgr.radial2.data.a
Normal file
2764
src/fx/fx.hgr.radial2.data.a
Normal file
File diff suppressed because it is too large
Load Diff
12
src/fx/fx.hgr.radial3.a
Normal file
12
src/fx/fx.hgr.radial3.a
Normal file
@ -0,0 +1,12 @@
|
||||
!cpu 6502
|
||||
!to "build/FX/RADIAL3",plain
|
||||
*=$6000
|
||||
|
||||
!source "src/fx/fx.hgr.radial.common.a"
|
||||
|
||||
@coords
|
||||
!source "src/fx/fx.hgr.radial3.data.a"
|
||||
!byte $80
|
||||
|
||||
!source "src/wait.a"
|
||||
!source "src/fx/fx.hgr.common.a"
|
2764
src/fx/fx.hgr.radial3.data.a
Normal file
2764
src/fx/fx.hgr.radial3.data.a
Normal file
File diff suppressed because it is too large
Load Diff
12
src/fx/fx.hgr.radial4.a
Normal file
12
src/fx/fx.hgr.radial4.a
Normal file
@ -0,0 +1,12 @@
|
||||
!cpu 6502
|
||||
!to "build/FX/RADIAL4",plain
|
||||
*=$6000
|
||||
|
||||
!source "src/fx/fx.hgr.radial.common.a"
|
||||
|
||||
@coords
|
||||
!source "src/fx/fx.hgr.radial4.data.a"
|
||||
!byte $80
|
||||
|
||||
!source "src/wait.a"
|
||||
!source "src/fx/fx.hgr.common.a"
|
2764
src/fx/fx.hgr.radial4.data.a
Normal file
2764
src/fx/fx.hgr.radial4.data.a
Normal file
File diff suppressed because it is too large
Load Diff
12
src/fx/fx.hgr.radial5.a
Normal file
12
src/fx/fx.hgr.radial5.a
Normal file
@ -0,0 +1,12 @@
|
||||
!cpu 6502
|
||||
!to "build/FX/RADIAL5",plain
|
||||
*=$6000
|
||||
|
||||
!source "src/fx/fx.hgr.radial.common.a"
|
||||
|
||||
@coords
|
||||
!source "src/fx/fx.hgr.radial5.data.a"
|
||||
!byte $80
|
||||
|
||||
!source "src/wait.a"
|
||||
!source "src/fx/fx.hgr.common.a"
|
2764
src/fx/fx.hgr.radial5.data.a
Normal file
2764
src/fx/fx.hgr.radial5.data.a
Normal file
File diff suppressed because it is too large
Load Diff
@ -2,39 +2,7 @@
|
||||
!to "build/FX/SUNRISE",plain
|
||||
*=$6000
|
||||
|
||||
coord = $FE
|
||||
|
||||
lda #<@coords
|
||||
sta coord
|
||||
lda #>@coords
|
||||
sta coord+1
|
||||
ldy #0
|
||||
@loop
|
||||
lda (coord),y
|
||||
bpl @copy
|
||||
lda #$28
|
||||
jsr WaitForKeyWithTimeout
|
||||
bmi @exit
|
||||
bpl @next ; always branches
|
||||
@copy
|
||||
tax
|
||||
iny
|
||||
lda (coord),y
|
||||
tay
|
||||
txa
|
||||
jsr HGRHalfBlockCopy
|
||||
@next
|
||||
inc coord
|
||||
bne +
|
||||
inc coord+1
|
||||
+ inc coord
|
||||
bne +
|
||||
inc coord+1
|
||||
+ ldy #$00
|
||||
lda ($FE),y
|
||||
cmp #$80
|
||||
bne @loop
|
||||
@exit rts
|
||||
!source "src/fx/fx.hgr.sunrise.common.a"
|
||||
|
||||
@coords
|
||||
!source "src/fx/fx.hgr.sunrise.data.a"
|
||||
|
33
src/fx/fx.hgr.sunrise.common.a
Normal file
33
src/fx/fx.hgr.sunrise.common.a
Normal file
@ -0,0 +1,33 @@
|
||||
coord = $FE
|
||||
|
||||
lda #<@coords
|
||||
sta coord
|
||||
lda #>@coords
|
||||
sta coord+1
|
||||
ldy #0
|
||||
@loop
|
||||
lda (coord),y
|
||||
bpl @copy
|
||||
lda #$28
|
||||
jsr WaitForKeyWithTimeout
|
||||
bmi @exit
|
||||
bpl @next ; always branches
|
||||
@copy
|
||||
tax
|
||||
iny
|
||||
lda (coord),y
|
||||
tay
|
||||
txa
|
||||
jsr HGRHalfBlockCopy
|
||||
@next
|
||||
inc coord
|
||||
bne +
|
||||
inc coord+1
|
||||
+ inc coord
|
||||
bne +
|
||||
inc coord+1
|
||||
+ ldy #$00
|
||||
lda ($FE),y
|
||||
cmp #$80
|
||||
bne @loop
|
||||
@exit rts
|
12
src/fx/fx.hgr.sunset.a
Normal file
12
src/fx/fx.hgr.sunset.a
Normal file
@ -0,0 +1,12 @@
|
||||
!cpu 6502
|
||||
!to "build/FX/SUNSET",plain
|
||||
*=$6000
|
||||
|
||||
!source "src/fx/fx.hgr.sunrise.common.a"
|
||||
|
||||
@coords
|
||||
!source "src/fx/fx.hgr.sunset.data.a"
|
||||
!byte $80
|
||||
|
||||
!source "src/wait.a"
|
||||
!source "src/fx/fx.hgr.common.a"
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user