Skip to content

Commit

Permalink
Redo ordering
Browse files Browse the repository at this point in the history
  • Loading branch information
AaronB-Hub committed Oct 17, 2024
1 parent 512ef3d commit a3c4bfd
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions src/melee/it/itCommonItems.h
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,32 @@ typedef struct itTaruCann_DatAttrs {
/* +2C */ int x2C;
} itTaruCann_DatAttrs;

// Should it_2F28 and it_27CF use the same structs?
typedef struct it_27CF_ItemVars {
f32 x0;
} it_27CF_ItemVars;

typedef struct it_27CF_DatAttrs {
Vec3 pos;
Vec3 vel;
f32 float1; // lifetime
f32 float2;
f32 float3; // item var x0
f32 x24; // item->xC98
int x28; // ItemKind
} it_27CF_DatAttrs;

typedef struct it_2F28_ItemVars {
f32 x0;
} it_2F28_ItemVars;

struct it_2F28_DatAttrs {
Vec3 pos;
Vec3 vel;
f32 float1; // lifetime
f32 float2; // item var x0
};

typedef struct it_2E5A_ItemVars_struct {
f32 x0; // set to float calc result/item->x3C
HSD_JObj* x4; // set to item_gobj->hsd_obj
Expand Down Expand Up @@ -504,30 +530,4 @@ typedef struct it_2E6A_ItemVars_2 {
/* +1C ip+DF0 */ void* x1C;
} it_2E6A_ItemVars_2;

// Should it_2F28 and it_27CF use the same structs?
typedef struct it_27CF_ItemVars {
f32 x0;
} it_27CF_ItemVars;

typedef struct it_27CF_DatAttrs {
Vec3 pos;
Vec3 vel;
f32 float1; // lifetime
f32 float2;
f32 float3; // item var x0
f32 x24; // item->xC98
int x28; // ItemKind
} it_27CF_DatAttrs;

typedef struct it_2F28_ItemVars {
f32 x0;
} it_2F28_ItemVars;

struct it_2F28_DatAttrs {
Vec3 pos;
Vec3 vel;
f32 float1; // lifetime
f32 float2; // item var x0
};

#endif

0 comments on commit a3c4bfd

Please sign in to comment.