Variable documentation

Author: AaronB-Hub

src/melee/it/itCommonItems.h

@@ -122,10 +122,8 @@ typedef struct FoodVars {
 
 typedef struct ItLGunAttr {
     int x0;
-    float x4;
-    float x8;
-    float xC;
-} ItLGunAttr; // Not sure if this struct size is correct or type of vars
+    Vec3 pos;
+} ItLGunAttr;
 
 typedef struct ItLGunVars {
     int x0;
@@ -140,27 +138,26 @@ typedef struct ItLGunBeamAttr {
 } ItLGunBeamAttr; // Not sure if this struct size is correct or type of vars
 
 typedef struct ItLGunBeamVars {
-    /* x0 */ Vec3 xDD4;  //
-    /* xC */ Vec3 xDE0;  //
-    /* x18 */ Vec3 xDEC; //
-    /* x24 */ f32 xDF8;  //
-    /* x28 */ f32 xDFC;  //
-    /* x2C */ f32 xE00;  //
-    /* x30 */ f32 xE04;  //
+    /* x0 */ Vec3 xDD4;  // pos
+    /* xC */ Vec3 xDE0;  // position
+    /* x18 */ Vec3 xDEC; // position
+    /* x24 */ f32 xDF8;  // angle?
+    /* x28 */ f32 xDFC;  // angle?
+    /* x2C */ f32 xE00;  // lifetime?
+    /* x30 */ f32 xE04;  // ??
 } ItLGunBeamVars;
 
 typedef struct ItLGunRayAttr {
     float speed;
     float lifetime;
-    float x8;
-    float xC;
+    float x8; // reference scale value?
 } ItLGunRayAttr;
 
 typedef struct ItLGunRayVars {
     /* ip+DD4 */ float scale;
     /* ip+DD8 */ float angle;
     /* ip+DDC */ float speed;
-    /* ip+DE0 */ Vec3 xC;
+    /* ip+DE0 */ Vec3 pos;
 } ItLGunRayVars;
 
 /// Eggs spawned on Yoshi stages / by Chansey

src/melee/it/items/itlgun.c

@@ -43,16 +43,16 @@ void it_8028E738(Item_GObj* gobj)
     Item* ip = gobj->user_data;
     ItLGunAttr* item_spec_attr = ip->xC4_article_data->x4_specialAttributes;
     ip->xD4C = item_spec_attr->x0;
-    ip->xDD4_itemVar.capsule.x0 = false;
+    ip->xDD4_itemVar.lgun.x0 = false;
     it_8028E860(gobj);
 }
 
 void it_8028E774(Item_GObj* gobj, Vec3* arg1)
 {
     ItLGunAttr* da = GET_ITEM(gobj)->xC4_article_data->x4_specialAttributes;
-    arg1->x = da->x4;
-    arg1->y = da->x8;
-    arg1->z = da->xC;
+    arg1->x = da->pos.x;
+    arg1->y = da->pos.y;
+    arg1->z = da->pos.z;
 }
 
 void it_8028E79C(Item_GObj* gobj, Vec3* pos, f32 facing_dir)
@@ -125,14 +125,17 @@ void it_8028E934(HSD_GObj* gobj) {}
 
 void it_8028E938(Item_GObj* gobj)
 {
-    GET_ITEM(gobj)->xDD4_itemVar.lgun.x0 = 40;
+    GET_ITEM(gobj)->xDD4_itemVar.lgun.x0 =
+        40; // The item ID of itlgunbeam is 39, so might be related (ID of
+            // itlgunray is 35 btw)
     Item_80268E5C(gobj, 3, ITEM_ANIM_UPDATE);
 }
 
 bool it_8028E96C(Item_GObj* gobj)
 {
     Item* ip = GET_ITEM(gobj);
-    --ip->xDD4_itemVar.lgun.x0;
+    --ip->xDD4_itemVar.lgun.x0; // Decrementing this value maybe supports that
+                                // it refers to the item ID of itlgunbeam
     if (ip->xDD4_itemVar.lgun.x0 <= 0) {
         Item_80268E5C(gobj, 2, ITEM_ANIM_UPDATE);
     }

src/melee/it/items/itlgunray.c

@@ -51,7 +51,7 @@ void it_80298168(HSD_GObj* owner_gobj, Vec3* pos, f32 facing_dir)
             ip->xDD4_itemVar.lgunray.angle =
                 ip->facing_dir == +1 ? 0 : (float) M_PI;
             ip->xDD4_itemVar.lgunray.speed = item_spec_attr->speed;
-            ip->xDD4_itemVar.lgunray.xC = spawn.pos;
+            ip->xDD4_itemVar.lgunray.pos = spawn.pos;
             ip->x40_vel.x = item_spec_attr->speed * ip->facing_dir;
             db_80225DD8(gobj, owner_gobj);
         }
@@ -102,7 +102,7 @@ int it_80298300(HSD_GObj* gobj)
 void it_802985D8(HSD_GObj* gobj)
 {
     Item* ip = GET_ITEM(gobj);
-    ip->xDD4_itemVar.lgunray.xC = ip->pos;
+    ip->xDD4_itemVar.lgunray.pos = ip->pos;
 }
 
 int it_802985F8(HSD_GObj* gobj)