Skip to content

Commit

Permalink
Updated Common files to make use of CommonFx
Browse files Browse the repository at this point in the history 
Creates a new CommonFx definition, changes the common files to use its prefix.
  • Loading branch information
@RealFoobs
RealFoobs committed Jan 19, 2023
1 parent 36d60f4 commit 7c0d405
Show file tree
Hide file tree
Showing 7 changed files with 361 additions and 10 deletions.
8 changes: 8 additions & 0 deletions data/GO.def
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[Info]
prefix = GO
fx.scale = 1

[Files]
sff = gofx.sff
air = gofx.air
snd = gofx.snd
10 changes: 5 additions & 5 deletions data/dizzy.zss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[Function fDizzyBirdHelper()]
if !numHelper(const(StateDizzyBirdsHelper)) {
explod{
anim: F const(FxBackgroundColor);
anim: GO const(FxBackgroundColor);
sprPriority: -6000;
space: screen;
posType: left;
Expand All @@ -33,7 +33,7 @@ let fvarB = cos($fvarA) * var(2) * 0.25;
let fvarC = (cos($fvarA) + 3) * 0.12 * ifElse(($fvarB < 0), -1, 1) * ((time % 9) * 0.05 + 1);
explod{
id: 0;
anim: F const(FxDizzyEffect) + var(10);
anim: GO const(FxDizzyEffect) + var(10);
posType: p1;
pos: floor(sin($fvarA) * var(2)), floor($fvarB + fVar(11));
sprPriority: ifElse($fvarB > 0, 6, -6);
Expand All @@ -46,13 +46,13 @@ explod{
# Dizzy Hit Ground Explod (direct copy from common1)
[Function fDizzyHitGroundExplod(vely)]
explod{
anim: F (60 + ($vely > const240p(5)) + ($vely > const240p(14)));
anim: GO (60 + ($vely > const240p(5)) + ($vely > const240p(14)));
posType: p1;
pos: 0, 0;
facing: Facing;
sprPriority: ifElse($vely <= const240p(14), -10, 10);
}
playSnd{value: F7, ($vely > const240p(5)) + ($vely > const240p(14))}
playSnd{value: GO7, ($vely > const240p(5)) + ($vely > const240p(14))}

#===============================================================================
# StateDizzyBirdsHelper [helper]
Expand Down Expand Up @@ -248,7 +248,7 @@ if time = 0 {
}

if (time % 42) = 0 {
playSnd{value: F5300, 0; channel: 2}
playSnd{value: GO5300, 0; channel: 2}
}

if time > 1 {
Expand Down
343 changes: 343 additions & 0 deletions data/gofx.air
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,343 @@
; Animation data for Fight Effects

; groupno, imageno, offx, offy, duration [, [flipflags] [, drawtype]]
; if duration is -1, then frame is displayed indefinitely.
; for flipflags (optional), H - horizonal flip, V - vertical flip.
; for drawtypes (optional), A - trans_add, S - trans_sub.

;---------------------------------------------------------------------------

;--------------------------
; Dizzy Birds
[Begin Action 5300]
5300,0, 0,0, 1
5300,0, 0,0, 1, ,AS240D016
5300,0, 0,0, 1, ,AS220D036
5300,0, 0,0, 1, ,AS200D056
5300,0, 0,0, 1, ,AS180D076
5300,0, 0,0, 1, ,AS160D096
5300,0, 0,0, 1, ,AS140D116
5300,0, 0,0, 1, ,AS120D136
5300,0, 0,0, 1, ,AS100D156
5300,0, 0,0, 1, ,AS080D176
5300,0, 0,0, 1, ,AS060D196
5300,0, 0,0, 1, ,AS040D216
5300,0, 0,0, 1, ,AS020D236

[Begin Action 5301]
5300,1, 0,0, 1
5300,1, 0,0, 1, ,AS240D016
5300,1, 0,0, 1, ,AS220D036
5300,1, 0,0, 1, ,AS200D056
5300,1, 0,0, 1, ,AS180D076
5300,1, 0,0, 1, ,AS160D096
5300,1, 0,0, 1, ,AS140D116
5300,1, 0,0, 1, ,AS120D136
5300,1, 0,0, 1, ,AS100D156
5300,1, 0,0, 1, ,AS080D176
5300,1, 0,0, 1, ,AS060D196
5300,1, 0,0, 1, ,AS040D216
5300,1, 0,0, 1, ,AS020D236

[Begin Action 5302]
5300,2, 0,0, 1
5300,2, 0,0, 1, ,AS240D016
5300,2, 0,0, 1, ,AS220D036
5300,2, 0,0, 1, ,AS200D056
5300,2, 0,0, 1, ,AS180D076
5300,2, 0,0, 1, ,AS160D096
5300,2, 0,0, 1, ,AS140D116
5300,2, 0,0, 1, ,AS120D136
5300,2, 0,0, 1, ,AS100D156
5300,2, 0,0, 1, ,AS080D176
5300,2, 0,0, 1, ,AS060D196
5300,2, 0,0, 1, ,AS040D216
5300,2, 0,0, 1, ,AS020D236

[Begin Action 5303]
5300,3, 0,0, 1
5300,3, 0,0, 1, ,AS240D016
5300,3, 0,0, 1, ,AS220D036
5300,3, 0,0, 1, ,AS200D056
5300,3, 0,0, 1, ,AS180D076
5300,3, 0,0, 1, ,AS160D096
5300,3, 0,0, 1, ,AS140D116
5300,3, 0,0, 1, ,AS120D136
5300,3, 0,0, 1, ,AS100D156
5300,3, 0,0, 1, ,AS080D176
5300,3, 0,0, 1, ,AS060D196
5300,3, 0,0, 1, ,AS040D216
5300,3, 0,0, 1, ,AS020D236

[Begin Action 5304]
5300,4, 0,0, 1
5300,4, 0,0, 1, ,AS240D016
5300,4, 0,0, 1, ,AS220D036
5300,4, 0,0, 1, ,AS200D056
5300,4, 0,0, 1, ,AS180D076
5300,4, 0,0, 1, ,AS160D096
5300,4, 0,0, 1, ,AS140D116
5300,4, 0,0, 1, ,AS120D136
5300,4, 0,0, 1, ,AS100D156
5300,4, 0,0, 1, ,AS080D176
5300,4, 0,0, 1, ,AS060D196
5300,4, 0,0, 1, ,AS040D216
5300,4, 0,0, 1, ,AS020D236

[Begin Action 5305]
5300,5, 0,0, 1
5300,5, 0,0, 1, ,AS240D016
5300,5, 0,0, 1, ,AS220D036
5300,5, 0,0, 1, ,AS200D056
5300,5, 0,0, 1, ,AS180D076
5300,5, 0,0, 1, ,AS160D096
5300,5, 0,0, 1, ,AS140D116
5300,5, 0,0, 1, ,AS120D136
5300,5, 0,0, 1, ,AS100D156
5300,5, 0,0, 1, ,AS080D176
5300,5, 0,0, 1, ,AS060D196
5300,5, 0,0, 1, ,AS040D216
5300,5, 0,0, 1, ,AS020D236

;--------------------------
; Guard Break spark
[Begin Action 5400]
5400,0, 0,0, 15
5400,0, 0,0, 1, ,AS250D006
5400,0, 0,0, 1, ,AS230D026
5400,0, 0,0, 1, ,AS210D046
5400,0, 0,0, 1, ,AS190D066
5400,0, 0,0, 1, ,AS170D086
5400,0, 0,0, 1, ,AS150D106
5400,0, 0,0, 1, ,AS130D126
5400,0, 0,0, 1, ,AS110D146
5400,0, 0,0, 1, ,AS090D166
5400,0, 0,0, 1, ,AS070D186
5400,0, 0,0, 1, ,AS050D206
5400,0, 0,0, 1, ,AS040D216
5400,0, 0,0, 1, ,AS030D226
5400,0, 0,0, 1, ,AS020D236
5400,0, 0,0, 1, ,AS010D246

[Begin Action 5401]
5400,1, 0,0, 12
5400,1, 0,0, 1, ,AS250D006
5400,1, 0,0, 1, ,AS230D026
5400,1, 0,0, 1, ,AS210D046
5400,1, 0,0, 1, ,AS190D066
5400,1, 0,0, 1, ,AS170D086
5400,1, 0,0, 1, ,AS150D106
5400,1, 0,0, 1, ,AS130D126
5400,1, 0,0, 1, ,AS110D146
5400,1, 0,0, 1, ,AS090D166
5400,1, 0,0, 1, ,AS070D186
5400,1, 0,0, 1, ,AS050D206
5400,1, 0,0, 1, ,AS040D216
5400,1, 0,0, 1, ,AS030D226
5400,1, 0,0, 1, ,AS020D236
5400,1, 0,0, 1, ,AS010D246

[Begin Action 5402]
5400,2, 0,0, 9
5400,2, 0,0, 1, ,AS250D006
5400,2, 0,0, 1, ,AS230D026
5400,2, 0,0, 1, ,AS210D046
5400,2, 0,0, 1, ,AS190D066
5400,2, 0,0, 1, ,AS170D086
5400,2, 0,0, 1, ,AS150D106
5400,2, 0,0, 1, ,AS130D126
5400,2, 0,0, 1, ,AS110D146
5400,2, 0,0, 1, ,AS090D166
5400,2, 0,0, 1, ,AS070D186
5400,2, 0,0, 1, ,AS050D206
5400,2, 0,0, 1, ,AS040D216
5400,2, 0,0, 1, ,AS030D226
5400,2, 0,0, 1, ,AS020D236
5400,2, 0,0, 1, ,AS010D246

; Guard Break shockwave
[Begin Action 5410]
5410,0, 0,0, 4, ,S
5410,1, 0,0, 4, ,S
5410,2, 0,0, 4, ,S
5410,3, 0,0, 4, ,S
5410,4, 0,0, 3, ,S
5410,5, 0,0, 3, ,S
5410,6, 0,0, 3, ,S

;--------------------------
; Tag Switch icons
;"AI"
[Begin Action 5600]
5600,0, 0,0, 70
5600,0, 0,0, 1, ,AS240D016
5600,0, 0,0, 1, ,AS220D036
5600,0, 0,0, 1, ,AS200D056
5600,0, 0,0, 1, ,AS180D076
5600,0, 0,0, 1, ,AS160D096
5600,0, 0,0, 1, ,AS140D116
5600,0, 0,0, 1, ,AS120D136
5600,0, 0,0, 1, ,AS100D156
5600,0, 0,0, 1, ,AS080D176
5600,0, 0,0, 1, ,AS060D196
5600,0, 0,0, 1, ,AS040D216
5600,0, 0,0, 1, ,AS020D236

;"P1"
[Begin Action 5601]
5600,1, 0,0, 70
5600,1, 0,0, 1, ,AS240D016
5600,1, 0,0, 1, ,AS220D036
5600,1, 0,0, 1, ,AS200D056
5600,1, 0,0, 1, ,AS180D076
5600,1, 0,0, 1, ,AS160D096
5600,1, 0,0, 1, ,AS140D116
5600,1, 0,0, 1, ,AS120D136
5600,1, 0,0, 1, ,AS100D156
5600,1, 0,0, 1, ,AS080D176
5600,1, 0,0, 1, ,AS060D196
5600,1, 0,0, 1, ,AS040D216
5600,1, 0,0, 1, ,AS020D236

;"P2"
[Begin Action 5602]
5600,2, 0,0, 70
5600,2, 0,0, 1, ,AS240D016
5600,2, 0,0, 1, ,AS220D036
5600,2, 0,0, 1, ,AS200D056
5600,2, 0,0, 1, ,AS180D076
5600,2, 0,0, 1, ,AS160D096
5600,2, 0,0, 1, ,AS140D116
5600,2, 0,0, 1, ,AS120D136
5600,2, 0,0, 1, ,AS100D156
5600,2, 0,0, 1, ,AS080D176
5600,2, 0,0, 1, ,AS060D196
5600,2, 0,0, 1, ,AS040D216
5600,2, 0,0, 1, ,AS020D236

;"P3"
[Begin Action 5603]
5600,1, 0,0, 70
5600,1, 0,0, 1, ,AS240D016
5600,1, 0,0, 1, ,AS220D036
5600,1, 0,0, 1, ,AS200D056
5600,1, 0,0, 1, ,AS180D076
5600,1, 0,0, 1, ,AS160D096
5600,1, 0,0, 1, ,AS140D116
5600,1, 0,0, 1, ,AS120D136
5600,1, 0,0, 1, ,AS100D156
5600,1, 0,0, 1, ,AS080D176
5600,1, 0,0, 1, ,AS060D196
5600,1, 0,0, 1, ,AS040D216
5600,1, 0,0, 1, ,AS020D236

;"P4"
[Begin Action 5604]
5600,2, 0,0, 70
5600,2, 0,0, 1, ,AS240D016
5600,2, 0,0, 1, ,AS220D036
5600,2, 0,0, 1, ,AS200D056
5600,2, 0,0, 1, ,AS180D076
5600,2, 0,0, 1, ,AS160D096
5600,2, 0,0, 1, ,AS140D116
5600,2, 0,0, 1, ,AS120D136
5600,2, 0,0, 1, ,AS100D156
5600,2, 0,0, 1, ,AS080D176
5600,2, 0,0, 1, ,AS060D196
5600,2, 0,0, 1, ,AS040D216
5600,2, 0,0, 1, ,AS020D236

;"P5"
[Begin Action 5605]
5600,1, 0,0, 70
5600,1, 0,0, 1, ,AS240D016
5600,1, 0,0, 1, ,AS220D036
5600,1, 0,0, 1, ,AS200D056
5600,1, 0,0, 1, ,AS180D076
5600,1, 0,0, 1, ,AS160D096
5600,1, 0,0, 1, ,AS140D116
5600,1, 0,0, 1, ,AS120D136
5600,1, 0,0, 1, ,AS100D156
5600,1, 0,0, 1, ,AS080D176
5600,1, 0,0, 1, ,AS060D196
5600,1, 0,0, 1, ,AS040D216
5600,1, 0,0, 1, ,AS020D236

;"P6"
[Begin Action 5606]
5600,2, 0,0, 70
5600,2, 0,0, 1, ,AS240D016
5600,2, 0,0, 1, ,AS220D036
5600,2, 0,0, 1, ,AS200D056
5600,2, 0,0, 1, ,AS180D076
5600,2, 0,0, 1, ,AS160D096
5600,2, 0,0, 1, ,AS140D116
5600,2, 0,0, 1, ,AS120D136
5600,2, 0,0, 1, ,AS100D156
5600,2, 0,0, 1, ,AS080D176
5600,2, 0,0, 1, ,AS060D196
5600,2, 0,0, 1, ,AS040D216
5600,2, 0,0, 1, ,AS020D236

;"P7"
[Begin Action 5607]
5600,1, 0,0, 70
5600,1, 0,0, 1, ,AS240D016
5600,1, 0,0, 1, ,AS220D036
5600,1, 0,0, 1, ,AS200D056
5600,1, 0,0, 1, ,AS180D076
5600,1, 0,0, 1, ,AS160D096
5600,1, 0,0, 1, ,AS140D116
5600,1, 0,0, 1, ,AS120D136
5600,1, 0,0, 1, ,AS100D156
5600,1, 0,0, 1, ,AS080D176
5600,1, 0,0, 1, ,AS060D196
5600,1, 0,0, 1, ,AS040D216
5600,1, 0,0, 1, ,AS020D236

;"P8"
[Begin Action 5608]
5600,2, 0,0, 70
5600,2, 0,0, 1, ,AS240D016
5600,2, 0,0, 1, ,AS220D036
5600,2, 0,0, 1, ,AS200D056
5600,2, 0,0, 1, ,AS180D076
5600,2, 0,0, 1, ,AS160D096
5600,2, 0,0, 1, ,AS140D116
5600,2, 0,0, 1, ,AS120D136
5600,2, 0,0, 1, ,AS100D156
5600,2, 0,0, 1, ,AS080D176
5600,2, 0,0, 1, ,AS060D196
5600,2, 0,0, 1, ,AS040D216
5600,2, 0,0, 1, ,AS020D236

;--------------------------
; Background color
[Begin Action 9000]
9000,0, 0,0, 1, ,AS006D250
9000,0, 0,0, 1, ,AS026D230
9000,0, 0,0, 1, ,AS046D210
9000,0, 0,0, 1, ,AS066D190
9000,0, 0,0, 1, ,AS086D170
9000,0, 0,0, 1, ,AS106D150
9000,0, 0,0, 1, ,AS126D130
9000,0, 0,0, 1, ,AS146D110
9000,0, 0,0, 1, ,AS166D090
9000,0, 0,0, 1, ,AS186D070
9000,0, 0,0, 1, ,AS206D050
9000,0, 0,0, 1, ,AS226D030
9000,0, 0,0, 1, ,AS246D010
9000,0, 0,0, 6
9000,0, 0,0, 1, ,AS246D010
9000,0, 0,0, 1, ,AS226D030
9000,0, 0,0, 1, ,AS206D050
9000,0, 0,0, 1, ,AS186D070
9000,0, 0,0, 1, ,AS166D090
9000,0, 0,0, 1, ,AS146D110
9000,0, 0,0, 1, ,AS126D130
9000,0, 0,0, 1, ,AS106D150
9000,0, 0,0, 1, ,AS086D170
9000,0, 0,0, 1, ,AS066D190
9000,0, 0,0, 1, ,AS046D210
9000,0, 0,0, 1, ,AS026D230
9000,0, 0,0, 1, ,AS006D250
Binary file added data/gofx.sff
View file
Binary file not shown.
Binary file added data/gofx.snd
View file
Binary file not shown.
Loading

0 comments on commit 7c0d405

Please sign in to comment.