Skip to content

Commit 2c0f2fe

Browse files
AaronB-Hubribbanya
AaronB-Hub
authored and
ribbanya
committed
formatting
1 parent ebab875 commit 2c0f2fe

File tree

7 files changed

+183
-132
lines changed

7 files changed

+183
-132
lines changed

‎src/melee/ft/ft_0CDD.c

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
#include "it/forward.h"
2+
13
#include "ft_0CDD.h"
24

3-
#include "it/forward.h"
45
#include "ef/efsync.h"
56
#include "ft/fighter.h"
67
#include "ft/ft_081B.h"
@@ -11,19 +12,19 @@
1112
#include "ft/ftcommon.h"
1213
#include "ftCommon/ftpickupitem.h"
1314
#include "it/it_26B1.h"
14-
#include "it/items/itlgun.h"
1515
#include "it/items/itfflower.h"
16+
#include "it/items/itlgun.h"
1617
#include "lb/lb_00B0.h"
1718

18-
#include <baselib/jobj.h>
1919
#include <dolphin/mtx/mtxvec.h>
20+
#include <baselib/jobj.h>
2021
#include <melee/it/item.h>
2122

22-
void ftCo_800CE0CC(HSD_GObj*); /* extern */
23-
void ftCo_800CE14C(HSD_GObj*); /* extern */
24-
void ftCo_800CE1D4(HSD_GObj*); /* extern */
25-
void ftCo_800CE620(HSD_GObj*); /* extern */
26-
void ftCo_800CE650(HSD_GObj*); /* extern */
23+
void ftCo_800CE0CC(HSD_GObj*); /* extern */
24+
void ftCo_800CE14C(HSD_GObj*); /* extern */
25+
void ftCo_800CE1D4(HSD_GObj*); /* extern */
26+
void ftCo_800CE620(HSD_GObj*); /* extern */
27+
void ftCo_800CE650(HSD_GObj*); /* extern */
2728
void it_8028E938(Item_GObj*); /* extern */
2829
UNK_RET ft_800D76B8(Fighter_GObj*); /* extern */
2930
UNK_RET ft_800D7770(Fighter_GObj*); /* extern */

‎src/melee/it/items/itfoxblaster.c

+25-19
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ void it_802ADF10(HSD_GObj* item_gobj)
209209
#else
210210
// u32 i;
211211
// u8 i;
212-
213-
212+
214213
Vec3 ft_cur_pos;
215214
// Vec3 ft_cur_then_it_joint_pos;
216215
Vec3 ft_hold_joint_pos;
@@ -219,7 +218,7 @@ void it_802ADF10(HSD_GObj* item_gobj)
219218
// s32 angle2;
220219
u8 i;
221220
Item* item;
222-
221+
223222
item = item_gobj->user_data;
224223

225224
// If blaster is shooting this frame, then spawn shooting effect at
@@ -244,9 +243,11 @@ void it_802ADF10(HSD_GObj* item_gobj)
244243
ftFx_SpecialN_ItGetHoldJoint(item->xDD4_itemVar.foxblaster.owner,
245244
&it_hold_joint_pos);
246245
// angle = atan2f(ft_hold_joint_pos.y - ft_cur_then_it_joint_pos.y,
247-
// ft_hold_joint_pos.x - ft_cur_then_it_joint_pos.x);
248-
item->xDD4_itemVar.foxblaster.angle = atan2f(ft_hold_joint_pos.y - it_hold_joint_pos.y,
249-
ft_hold_joint_pos.x - it_hold_joint_pos.x);
246+
// ft_hold_joint_pos.x -
247+
// ft_cur_then_it_joint_pos.x);
248+
item->xDD4_itemVar.foxblaster.angle =
249+
atan2f(ft_hold_joint_pos.y - it_hold_joint_pos.y,
250+
ft_hold_joint_pos.x - it_hold_joint_pos.x);
250251
item->xDD4_itemVar.foxblaster.xDFC = 0;
251252
// efSync_Spawn(0x48E, item_gobj, &ft_hold_joint_pos,
252253
// item->xDD4_itemVar.foxblaster.angle_1, angle);
@@ -268,9 +269,11 @@ void it_802ADF10(HSD_GObj* item_gobj)
268269
ftKb_SpecialNFx_800FDC70(item->xDD4_itemVar.foxblaster.owner,
269270
&it_hold_joint_pos);
270271
// angle = atan2f(ft_hold_joint_pos.y - ft_cur_then_it_joint_pos.y,
271-
// ft_hold_joint_pos.x - ft_cur_then_it_joint_pos.x);
272-
item->xDD4_itemVar.foxblaster.angle = atan2f(ft_hold_joint_pos.y - it_hold_joint_pos.y,
273-
ft_hold_joint_pos.x - it_hold_joint_pos.x);
272+
// ft_hold_joint_pos.x -
273+
// ft_cur_then_it_joint_pos.x);
274+
item->xDD4_itemVar.foxblaster.angle =
275+
atan2f(ft_hold_joint_pos.y - it_hold_joint_pos.y,
276+
ft_hold_joint_pos.x - it_hold_joint_pos.x);
274277
item->xDD4_itemVar.foxblaster.xDFC = 0;
275278
// efSync_Spawn(0x4AC, item_gobj, &ft_hold_joint_pos,
276279
// item->xDD4_itemVar.foxblaster.angle_1, angle);
@@ -1084,17 +1087,20 @@ int it_802AF064(HSD_GObj* item_gobj)
10841087
if (item_gobj != NULL) {
10851088
item = item_gobj->user_data;
10861089
if (item != NULL) {
1087-
// if (item_gobj->user_data != NULL) {
1090+
// if (item_gobj->user_data != NULL) {
10881091
if ((item->xDD4_itemVar.foxblaster.owner != NULL) &&
1089-
(ftCo_800BF228((Fighter_GObj*)
1090-
item->xDD4_itemVar.foxblaster.owner) == 1)) {
1091-
// if ((((Item*) item_gobj->user_data)
1092-
// ->xDD4_itemVar.foxblaster.owner != NULL) &&
1093-
// (ftCo_800BF228((Fighter_GObj*) ((Item*) item_gobj->user_data)
1094-
// ->xDD4_itemVar.foxblaster.owner) == true))
1095-
// {
1096-
ft_scale.x = ft_scale.y = ft_scale.z =
1097-
HSD_JObjGetScaleY(item->xDD4_itemVar.foxblaster.owner->hsd_obj);
1092+
(ftCo_800BF228((Fighter_GObj*)
1093+
item->xDD4_itemVar.foxblaster.owner) == 1))
1094+
{
1095+
// if ((((Item*) item_gobj->user_data)
1096+
// ->xDD4_itemVar.foxblaster.owner != NULL) &&
1097+
// (ftCo_800BF228((Fighter_GObj*) ((Item*)
1098+
// item_gobj->user_data)
1099+
// ->xDD4_itemVar.foxblaster.owner) ==
1100+
// true))
1101+
// {
1102+
ft_scale.x = ft_scale.y = ft_scale.z = HSD_JObjGetScaleY(
1103+
item->xDD4_itemVar.foxblaster.owner->hsd_obj);
10981104
// ft_scale.x = ft_scale.y = ft_scale.z = HSD_JObjGetScaleY(
10991105
// ((Item*) item_gobj->user_data)
11001106
// ->xDD4_itemVar.foxblaster.owner->hsd_obj);

‎src/melee/it/items/itlgun.c

+82-59
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@
1010
#include <melee/it/item.h>
1111

1212
// void it_80298168(s32); /* extern */
13-
void it_80298168(HSD_GObj*); /* extern */
14-
int it_8028E828(HSD_GObj*); /* static */
15-
void it_8028E830(HSD_GObj*); /* static */
16-
int it_8028E834(HSD_GObj*); /* static */
13+
void it_80298168(HSD_GObj*); /* extern */
14+
int it_8028E828(HSD_GObj*); /* static */
15+
void it_8028E830(HSD_GObj*); /* static */
16+
int it_8028E834(HSD_GObj*); /* static */
1717
// void it_8028E860(s32 arg0, Item*); /* static */
18-
void it_8028E860(HSD_GObj*); /* static */
19-
int it_8028E888(HSD_GObj*); /* static */
20-
void it_8028E890(HSD_GObj*); /* static */
21-
int it_8028E8C0(HSD_GObj*); /* static */
22-
int it_8028E92C(HSD_GObj*); /* static */
23-
void it_8028E934(HSD_GObj*); /* static */
24-
int it_8028E96C(HSD_GObj*); /* static */
25-
void it_8028E9B4(HSD_GObj*); /* static */
26-
void it_8028EA08(HSD_GObj*); /* static */
27-
int it_8028EB28(HSD_GObj*); /* static */
28-
void it_8028EB30(HSD_GObj*); /* static */
29-
int it_8028EB34(HSD_GObj*); /* static */
18+
void it_8028E860(HSD_GObj*); /* static */
19+
int it_8028E888(HSD_GObj*); /* static */
20+
void it_8028E890(HSD_GObj*); /* static */
21+
int it_8028E8C0(HSD_GObj*); /* static */
22+
int it_8028E92C(HSD_GObj*); /* static */
23+
void it_8028E934(HSD_GObj*); /* static */
24+
int it_8028E96C(HSD_GObj*); /* static */
25+
void it_8028E9B4(HSD_GObj*); /* static */
26+
void it_8028EA08(HSD_GObj*); /* static */
27+
int it_8028EB28(HSD_GObj*); /* static */
28+
void it_8028EB30(HSD_GObj*); /* static */
29+
int it_8028EB34(HSD_GObj*); /* static */
3030

3131
ItemStateTable it_803F5CC8[] = {
3232
{ -1, it_8028E828, it_8028E830, it_8028E834 },
@@ -37,7 +37,8 @@ ItemStateTable it_803F5CC8[] = {
3737
{ -1, it_8028EB28, it_8028EB30, it_8028EB34 },
3838
};
3939

40-
void it_8028E738(Item_GObj* item_gobj) {
40+
void it_8028E738(Item_GObj* item_gobj)
41+
{
4142
Item* item;
4243
ItLGunAttr* item_spec_attr;
4344

@@ -51,10 +52,12 @@ void it_8028E738(Item_GObj* item_gobj) {
5152

5253
// void it_8028E774(void* item_gobj, void* arg1) {
5354
// void it_8028E774(Item_GObj* item_gobj, itUnkAttributes* arg1) {
54-
void it_8028E774(Item_GObj* item_gobj, Vec3* arg1) {
55+
void it_8028E774(Item_GObj* item_gobj, Vec3* arg1)
56+
{
5557
ItLGunAttr* item_spec_attr;
5658

57-
item_spec_attr = ((Item*) item_gobj->user_data)->xC4_article_data->x4_specialAttributes;
59+
item_spec_attr =
60+
((Item*) item_gobj->user_data)->xC4_article_data->x4_specialAttributes;
5861
// arg1->unk0 = (f32) item_spec_attr->x4_float;
5962
// arg1->x0_float = item_spec_attr->x4;
6063
arg1->x = item_spec_attr->x4;
@@ -68,7 +71,8 @@ void it_8028E774(Item_GObj* item_gobj, Vec3* arg1) {
6871

6972
// void it_8028E79C(void* item_gobj) {
7073
// void it_8028E79C(Item_GObj* item_gobj) {
71-
void it_8028E79C(Item_GObj* item_gobj, f32 dir) {
74+
void it_8028E79C(Item_GObj* item_gobj, f32 dir)
75+
{
7276
Item* item;
7377

7478
item = item_gobj->user_data;
@@ -78,7 +82,8 @@ void it_8028E79C(Item_GObj* item_gobj, f32 dir) {
7882
it_80298168(item->owner);
7983
}
8084

81-
void it_8028E7D8(HSD_GObj* item_gobj) {
85+
void it_8028E7D8(HSD_GObj* item_gobj)
86+
{
8287
Item* item;
8388

8489
item = item_gobj->user_data;
@@ -89,62 +94,70 @@ void it_8028E7D8(HSD_GObj* item_gobj) {
8994
Item_80268E5C((Item_GObj*) item_gobj, 0, ITEM_ANIM_UPDATE);
9095
}
9196

92-
int it_8028E828(HSD_GObj* item_gobj) {
97+
int it_8028E828(HSD_GObj* item_gobj)
98+
{
9399
return 0;
94100
}
95101

96-
void it_8028E830(HSD_GObj* item_gobj) {
97-
}
102+
void it_8028E830(HSD_GObj* item_gobj) {}
98103

99-
int it_8028E834(HSD_GObj* item_gobj) {
104+
int it_8028E834(HSD_GObj* item_gobj)
105+
{
100106
it_8026D62C((Item_GObj*) item_gobj, it_8028E860);
101107
return 0;
102108
}
103109

104110
// void it_8028E860(s32 arg0, Item* item) {
105-
void it_8028E860(HSD_GObj* item_gobj) {
111+
void it_8028E860(HSD_GObj* item_gobj)
112+
{
106113
Item_80268E5C((Item_GObj*) item_gobj, 1, ITEM_ANIM_UPDATE);
107114
}
108115

109-
int it_8028E888(HSD_GObj* item_gobj) {
116+
int it_8028E888(HSD_GObj* item_gobj)
117+
{
110118
return 0;
111119
}
112120

113-
void it_8028E890(HSD_GObj* item_gobj) {
121+
void it_8028E890(HSD_GObj* item_gobj)
122+
{
114123
ItemAttr* item_comm_attr;
115124

116125
item_comm_attr = ((Item*) item_gobj->user_data)->xCC_item_attr;
117-
it_80272860((Item_GObj*) item_gobj, item_comm_attr->x10_fall_speed, item_comm_attr->x14_fall_speed_max);
126+
it_80272860((Item_GObj*) item_gobj, item_comm_attr->x10_fall_speed,
127+
item_comm_attr->x14_fall_speed_max);
118128
}
119129

120-
int it_8028E8C0(HSD_GObj* item_gobj) {
130+
int it_8028E8C0(HSD_GObj* item_gobj)
131+
{
121132
if (((Item*) item_gobj->user_data)->xD4C != 0) {
122133
it_8026E15C((Item_GObj*) item_gobj, it_8028E7D8);
123134
return 0;
124135
}
125136
return it_8026DF34((Item_GObj*) item_gobj);
126137
}
127138

128-
void it_8028E904(Item_GObj* item_gobj) {
139+
void it_8028E904(Item_GObj* item_gobj)
140+
{
129141
Item_80268E5C(item_gobj, 2, ITEM_ANIM_UPDATE);
130142
}
131143

132-
int it_8028E92C(HSD_GObj* item_gobj) {
144+
int it_8028E92C(HSD_GObj* item_gobj)
145+
{
133146
return 0;
134147
}
135148

136-
void it_8028E934(HSD_GObj* item_gobj) {
137-
138-
}
149+
void it_8028E934(HSD_GObj* item_gobj) {}
139150

140151
// void it_8028E938(HSD_GObj* item_gobj) {
141-
void it_8028E938(Item_GObj* item_gobj) {
152+
void it_8028E938(Item_GObj* item_gobj)
153+
{
142154
((Item*) item_gobj->user_data)->xDD4_itemVar.lgun.x0 = 0x28;
143155
Item_80268E5C(item_gobj, 3, ITEM_ANIM_UPDATE);
144156
}
145157

146158
// s32 it_8028E96C(HSD_GObj* item_gobj) {
147-
int it_8028E96C(HSD_GObj* item_gobj) {
159+
int it_8028E96C(HSD_GObj* item_gobj)
160+
{
148161
Item* item;
149162

150163
item = item_gobj->user_data;
@@ -155,67 +168,77 @@ int it_8028E96C(HSD_GObj* item_gobj) {
155168
return 0;
156169
}
157170

158-
void it_8028E9B4(HSD_GObj* item_gobj) {
159-
160-
}
171+
void it_8028E9B4(HSD_GObj* item_gobj) {}
161172

162-
void it_8028E9B8(Item_GObj* item_gobj) {
173+
void it_8028E9B8(Item_GObj* item_gobj)
174+
{
163175
Item_80268E5C(item_gobj, 4, 6);
164176
}
165177

166-
void it_8028E9E0(Item_GObj* item_gobj) {
178+
void it_8028E9E0(Item_GObj* item_gobj)
179+
{
167180
Item_80268E5C(item_gobj, 4, 6);
168181
}
169182

170-
void it_8028EA08(HSD_GObj* item_gobj) {
183+
void it_8028EA08(HSD_GObj* item_gobj)
184+
{
171185
ItemAttr* item_comm_attr;
172186

173187
item_comm_attr = ((Item*) item_gobj->user_data)->xCC_item_attr;
174-
it_80272860((Item_GObj*) item_gobj, item_comm_attr->x10_fall_speed, item_comm_attr->x14_fall_speed_max);
175-
it_80274658((HSD_GObj* ) item_gobj, it_804D6D28->x68_float);
188+
it_80272860((Item_GObj*) item_gobj, item_comm_attr->x10_fall_speed,
189+
item_comm_attr->x14_fall_speed_max);
190+
it_80274658((HSD_GObj*) item_gobj, it_804D6D28->x68_float);
176191
}
177192

178-
int it_8028EA54(Item_GObj* item_gobj) {
193+
int it_8028EA54(Item_GObj* item_gobj)
194+
{
179195
itColl_BounceOffVictim(item_gobj);
180196
return 0;
181197
}
182198

183-
int it_8028EA78(Item_GObj* item_gobj) {
199+
int it_8028EA78(Item_GObj* item_gobj)
200+
{
184201
itColl_BounceOffVictim((Item_GObj*) item_gobj);
185202
return 0;
186203
}
187204

188-
int it_8028EA9C(Item_GObj* item_gobj) {
205+
int it_8028EA9C(Item_GObj* item_gobj)
206+
{
189207
itColl_BounceOffVictim(item_gobj);
190208
return 0;
191209
}
192210

193-
int it_8028EAC0(Item_GObj* item_gobj) {
211+
int it_8028EAC0(Item_GObj* item_gobj)
212+
{
194213
return it_80273030(item_gobj);
195214
}
196215

197-
int it_8028EAE0(Item_GObj* item_gobj) {
216+
int it_8028EAE0(Item_GObj* item_gobj)
217+
{
198218
return itColl_BounceOffShield(item_gobj);
199219
}
200220

201-
void it_8028EB00(Item_GObj* item_gobj) {
221+
void it_8028EB00(Item_GObj* item_gobj)
222+
{
202223
Item_80268E5C(item_gobj, 5, ITEM_ANIM_UPDATE);
203224
}
204225

205-
int it_8028EB28(HSD_GObj* item_gobj) {
226+
int it_8028EB28(HSD_GObj* item_gobj)
227+
{
206228
return 0;
207229
}
208230

209-
void it_8028EB30(HSD_GObj* item_gobj) {
210-
211-
}
231+
void it_8028EB30(HSD_GObj* item_gobj) {}
212232

213-
int it_8028EB34(HSD_GObj* item_gobj) {
214-
it_8026E8C4((Item_GObj*) item_gobj, (void (*)(HSD_GObj*)) it_8028E7D8, it_8028E860);
233+
int it_8028EB34(HSD_GObj* item_gobj)
234+
{
235+
it_8026E8C4((Item_GObj*) item_gobj, (void (*)(HSD_GObj*)) it_8028E7D8,
236+
it_8028E860);
215237
return 0;
216238
}
217239

218240
// void it_8028EB68(Item_GObj* item_gobj_1, Item_GObj* item_gobj_2) {
219-
void it_8028EB68(Item_GObj* item_gobj, HSD_GObj* ref_gobj) {
241+
void it_8028EB68(Item_GObj* item_gobj, HSD_GObj* ref_gobj)
242+
{
220243
it_8026B894(item_gobj, ref_gobj);
221-
}
244+
}

‎src/melee/it/items/itlgun.h

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "it/forward.h"
66

77
#include "it/items/types.h"
8+
89
#include <dolphin/mtx/types.h>
910

1011
/* 28E738 */ void it_8028E738(Item_GObj*);

0 commit comments

Comments
 (0)