Skip to content

Commit

Permalink
clean up defs
Browse files Browse the repository at this point in the history
  • Loading branch information
@thefoxcam
thefoxcam committed Jul 25, 2024
1 parent cbd361e commit 306fa46
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 22 deletions.
14 changes: 8 additions & 6 deletions src/melee/it/it_266F.c
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "it/it_266F.h"
#include "lb/lbcollision.h"

#include "gm/gm_1601.h"
Expand Down Expand Up @@ -26,8 +27,8 @@ s32 it_8026CB3C(Vec3 *arg0);
f32 gm_8016AE94();
u64 gm_8016AEA4();
bool gm_8016AE80();
s32 it_80272828(s32);

bool it_8026D324(s32);
s32 it_8026DDFC(Item_GObj *arg0);
s32 it_8026DBC8(HSD_GObj *gobj);

Expand All @@ -48,6 +49,8 @@ typedef struct test_struct {
s32 unk1C;
} test_struct;

void it_8026C47C(test_struct *);

void it_8026C47C(test_struct *arg0) {
s32 *var_r28;
s32 var_r29;
Expand Down Expand Up @@ -461,8 +464,6 @@ s32 it_8026D604(HSD_GObj *gobj) {
return mpLib_80054ED8(ip->xC30);
}

typedef void (*ItCallback)(HSD_GObj *);

void it_8026D62C(Item_GObj *gobj, ItCallback arg1) {
CollData *coll;
Item *ip;
Expand Down Expand Up @@ -816,8 +817,8 @@ s32 it_8026DFB0(Item_GObj *gobj) {
if (cond) {
ip->xC30 = (u32) coll->floor.index;
}
cond |= it_80276308(ip);
if ((cond | it_802763E0(ip)) & 0xF) {
cond |= it_80276308(gobj);
if ((cond | it_802763E0(gobj)) & 0xF) {
return 1;
}
return 0;
Expand All @@ -836,7 +837,7 @@ s32 it_8026E058(Item_GObj *gobj) {
if (cond) {
ip->xC30 = (u32) coll->floor.index;
}
cond |= it_80276308(ip);
cond |= it_80276308(gobj);
if (cond & 0xD) {
return 1;
}
Expand Down Expand Up @@ -1077,6 +1078,7 @@ void it_8026EECC(HSD_GObj *gobj, s32 arg1) {
pos.x = pos.y = pos.z = 0.0F;
}
}
// @todo This could just be one big function call.
{
Item *ip = gobj->user_data;
switch (Camera_80031060()) {
Expand Down
63 changes: 47 additions & 16 deletions src/melee/it/it_266F.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,57 @@

#include <placeholder.h>

typedef void (*ItCallback)(HSD_GObj *);

/* 077688 */ UNK_RET ftColl_80077688(UNK_PARAMS);
/* 26D324 */ bool it_8026D324(bool);
/* 26D604 */ s32 it_8026D604(HSD_GObj* gobj);
/* 26D62C */ void it_8026D62C(Item_GObj*, HSD_GObjEvent);
/* 26C75C */ s8 it_8026C75C(HSD_ObjAllocUnk6 *arg0);
/* 26C88C */ void fn_8026C88C(HSD_GObj *gobj);
/* 26CA4C */ void it_8026CA4C(u16 *arg0, s32 *arg1, u64 arg2, s32 arg4, f32 arg8);
/* 26CB3C */ s32 it_8026CB3C(Vec3 *arg0);
/* 26CB9C */ void it_8026CB9C(s32 *arg0, u64 arg2, u32 arg3, f32 arg8);
/* 26CF04 */ void it_8026CF04(void);
/* 26D018 */ void it_8026D018(void);
/* 26D258 */ s32 it_8026D258(void *arg0, s32 arg1);
/* 26D324 */ bool it_8026D324(s32);
/* 26D324 */ bool it_8026D324(s32 arg0);
/* 26D3CC */ s32 it_8026D3CC(void);
/* 26D564 */ void it_8026D564(Item_GObj *gobj);
/* 26D5CC */ void it_8026D5CC(Item_GObj *gobj);
/* 26D604 */ s32 it_8026D604(HSD_GObj *gobj);
/* 26D62C */ void it_8026D62C(Item_GObj *gobj, ItCallback arg1);
/* 26D6F4 */ void it_8026D6F4(Item_GObj *gobj, ItCallback arg1);
/* 26D78C */ void it_8026D78C(Item_GObj *gobj, ItCallback arg1);
/* 26D82C */ void it_8026D82C(Item_GObj *gobj);
/* 26D8A4 */ s32 it_8026D8A4(Item_GObj *gobj, ItCallback arg1);
/* 26D938 */ void it_8026D938(Item_GObj *gobj, ItCallback arg1);
/* 26D9A0 */ bool it_8026D9A0(Item_GObj*);
/* 26DA08 */ bool it_8026DA08(Item_GObj*);
/* 26DA70 */ s32 it_8026DA70(HSD_GObj*);
/* 26DAA8 */ s32 it_8026DAA8(Item_GObj*);
/* 26DF34 */ bool it_8026DF34(Item_GObj*);
/* 26DFB0 */ bool it_8026DFB0(Item_GObj*);
/* 26EA20 */ bool it_8026EA20(Item_GObj*, Vec3*, Vec3*, Vec3*, s32*, UNK_T);
/* 26E0F4 */ void it_8026E0F4(Item_GObj*);
/* 26E15C */ void it_8026E15C(Item_GObj*, HSD_GObjEvent);
/* 26E248 */ void it_8026E248(Item_GObj*, HSD_GObjEvent);
/* 26DA08 */ void it_8026DA08(Item_GObj *gobj);
/* 26DA70 */ bool it_8026DA70(Item_GObj *gobj);
/* 26DAA8 */ s32 it_8026DAA8(Item_GObj *gobj);
/* 26DB40 */ s32 it_8026DB40(Item_GObj *gobj);
/* 26DBC8 */ s32 it_8026DBC8(HSD_GObj *gobj);
/* 26DC24 */ s32 it_8026DC24(HSD_GObj *gobj);
/* 26DD5C */ s32 it_8026DD5C(Item_GObj *gobj);
/* 26DDFC */ s32 it_8026DDFC(Item_GObj *gobj);
/* 26DE98 */ s32 it_8026DE98(Item_GObj *arg0);
/* 26DF34 */ s32 it_8026DF34(Item_GObj *gobj);
/* 26DFB0 */ s32 it_8026DFB0(Item_GObj *gobj);
/* 26E058 */ s32 it_8026E058(Item_GObj *gobj);
/* 26E0F4 */ void it_8026E0F4(Item_GObj *gobj);
/* 26E15C */ void it_8026E15C(Item_GObj *gobj, ItCallback arg1);
/* 26E248 */ void it_8026E248(Item_GObj *gobj, ItCallback arg1);
/* 26E414 */ void it_8026E414(Item_GObj*, HSD_GObjEvent);
/* 26E71C */ void it_8026E71C(Item_GObj*, HSD_GObjEvent);
/* 26E8C4 */ void it_8026E8C4(Item_GObj*, HSD_GObjEvent, HSD_GObjEvent);
/* 26E9A4 */ bool it_8026E9A4(Item_GObj*, Vec3*, Vec3*, int);
/* 26EECC */ void it_8026EECC(HSD_GObj*, int);
/* 26E9A4 */ s32 it_8026E9A4(Item_GObj *arg0, Vec3 *arg1, Vec3 *arg2, s32 arg3);
/* 26EA20 */ s32 it_8026EA20(Item_GObj *arg0, Vec3 *arg1, Vec3 *arg2, Vec3 *arg3, s32 *arg4, s32 arg5);
/* 26EA9C */ s32 it_8026EA9C(Item_GObj *arg0, Vec3 *arg1, Vec3 *arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6);
/* 26EB18 */ void it_8026EB18(HSD_GObj *arg0, s32 arg1, Vec3 *arg2);
/* 26EBC8 */ void it_8026EBC8(HSD_GObj *gobj, u16 arg1, u8 *arg2);
/* 26EC54 */ void it_8026EC54(HSD_GObj *gobj, u16 arg1, u8 *arg2);
/* 26ECE0 */ u32 it_8026ECE0(Item_GObj *gobj, u32 arg1);
/* 26EECC */ void it_8026EECC(HSD_GObj *gobj, s32 arg1);
/* 26F3AC */ void it_8026F3AC(void);
/* 26F3D4 */ void it_8026F3D4(Item_GObj*, int, bool, int);
/* 26F8B4 */ bool it_8026F8B4(Item_GObj*, Vec3*, Vec3*, int);
/* 26F9A0 */ void it_8026F9A0(void);
Expand Down Expand Up @@ -64,8 +96,8 @@
/* 272C90 */ HSD_JObj* it_80272C90(Item_GObj* gobj);
/* 272D1C */ bool it_80272D1C(HSD_GObj* gobj);
/* 272D40 */ s32 it_80272D40(HSD_GObj* gobj);
/* 272db0 */ bool itColl_BounceOffVictim(Item_GObj*);
/* 272F7C */ void it_80272F7C(HSD_JObj*, f32);
/* 272db0 */ bool itColl_BounceOffVictim(Item_GObj*);
/* 273030 */ bool it_80273030(Item_GObj*);
/* 273078 */ bool itColl_BounceOffShield(Item_GObj*);
/* 273130 */ bool it_80273130(Item_GObj*);
Expand Down Expand Up @@ -120,7 +152,6 @@
/* 279BE0 */ void it_80279BE0(HSD_GObj* gobj);
/* 279CDC */ void it_80279CDC(HSD_GObj*, f32);
/* 27A160 */ void it_8027A160(HSD_JObj* bone, Item*);
u32 it_8026ECE0(Item_GObj *, u32);
/* 27A344 */ void it_8027A344(Item_GObj*);
/* 27B0C4 */ void it_8027B0C4(HSD_GObj*, SpawnItem*);
/* 27B4A4 */ void it_8027B4A4(Fighter_GObj*, Item_GObj*);
Expand Down

0 comments on commit 306fa46

Please sign in to comment.