From a3c4bfde097d1b252fa42c82272aba709f86e701 Mon Sep 17 00:00:00 2001
From: Aaron B <aaronbo@bu.edu>
Date: Thu, 17 Oct 2024 11:04:26 -0400
Subject: [PATCH] Redo ordering

---
 src/melee/it/itCommonItems.h | 52 ++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/melee/it/itCommonItems.h b/src/melee/it/itCommonItems.h
index d158639e70..f619f1488e 100644
--- a/src/melee/it/itCommonItems.h
+++ b/src/melee/it/itCommonItems.h
@@ -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
@@ -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