Skip to content

Commit 2f30bc8

Browse files
committed
Filled data out
1 parent d0bd7e5 commit 2f30bc8

File tree

1 file changed

+85
-10
lines changed

1 file changed

+85
-10
lines changed

src/SB/Game/zFX.cpp

Lines changed: 85 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,91 @@
1313
#include <stdlib.h>
1414
#include <PowerPC_EABI_Support\MSL_C\MSL_Common\cmath>
1515

16-
extern xFXRing sPatrickStunRing[3];
17-
extern xFXRing sHammerRing[1];
18-
extern xFXRing sPorterRing[2];
19-
extern xFXRing sMuscleArmRing[1];
20-
21-
// TODO: the above vars should be const (like they are below). Simply need to find what they are equal to.
22-
// const xFXRing sPatrickStunRing[3] = { 1, 2, 3 };
23-
// const xFXRing sHammerRing[1] = { 0 };
24-
// const xFXRing sPorterRing[2] = { 0 };
25-
// const xFXRing sMuscleArmRing[1] = { 0 };
16+
const xFXRing sPatrickStunRing[3] = { { 0x741b0566,
17+
1.0f,
18+
{ 0.0f, 0.0f, 0.0f },
19+
0.0f,
20+
0.5f,
21+
4.0f,
22+
PI / 2.0f,
23+
PI / -2.0f,
24+
0.5f,
25+
-0.25f,
26+
{ 255, 255, 255, 255 },
27+
32,
28+
3,
29+
1,
30+
{ NULL } },
31+
{ 0x741b0566,
32+
1.5f,
33+
{ 0.0f, 0.0f, 0.0f },
34+
0.0f,
35+
0.75f,
36+
5.0f,
37+
PI / 2.0f,
38+
PI / -2.0f,
39+
0.375f,
40+
-0.1875f,
41+
{ 127, 127, 127, 127 },
42+
32,
43+
2,
44+
1,
45+
{ NULL } },
46+
{ 0x741b0566,
47+
2.0f,
48+
{ 0.0f, 0.0f, 0.0f },
49+
0.0f,
50+
1.0f,
51+
6.0f,
52+
PI / 2.0f,
53+
PI / -2.0f,
54+
0.25f,
55+
-0.125f,
56+
{ 63, 63, 63, 63 },
57+
32,
58+
1,
59+
1,
60+
{ NULL } } };
61+
const xFXRing sHammerRing[1] = {
62+
0x741b0566, 0.75f, { 0.0f, 0.0f, 0.0f }, 0.0f, 0.4f, 2.4f, PI / 2.0f, PI / -2.0f,
63+
0.6f, -0.6f, { 255, 255, 255, 127 }, 32, 2, 1, NULL
64+
};
65+
const xFXRing sPorterRing[2] = {
66+
{ 0x741b0566,
67+
1.2f,
68+
{ 0.0f, 0.0f, 0.0f },
69+
0.1f,
70+
0.0f,
71+
3.0f,
72+
PI / 2.0f,
73+
PI / -2.0f,
74+
0.6f,
75+
-0.6f,
76+
{ 180, 180, 45, 127 },
77+
16,
78+
2,
79+
1,
80+
{ NULL } },
81+
{ 0x741b0566,
82+
0.5f,
83+
{ 0.0f, 0.25f, 0.0f },
84+
0.0f,
85+
1.5f,
86+
-3.0f,
87+
PI / -2.0f,
88+
PI / 2.0f,
89+
1.2f,
90+
-2.4f,
91+
{ 64, 128, 128, 127 },
92+
8,
93+
2,
94+
1,
95+
{ NULL } },
96+
};
97+
const xFXRing sMuscleArmRing[1] = {
98+
0x741b0566, 3.0f, { 0.0f, 0.0f, 0.0f }, 0.0f, 0.0f, 90.0f, PI / 2.0f, 0.0f,
99+
0.6f, 30.0f, { 255, 255, 255, 160 }, 48, 1, 1, NULL
100+
};
26101

27102
zFXGooInstance zFXGooInstances[24];
28103

0 commit comments

Comments
 (0)