diff --git a/src/melee/it/itCommonItems.h b/src/melee/it/itCommonItems.h index fc699910ca..7075482599 100644 --- a/src/melee/it/itCommonItems.h +++ b/src/melee/it/itCommonItems.h @@ -225,7 +225,7 @@ typedef struct HassamVars { f32 xC; f32 x10; f32 x14; - f32 x18_padding; + s32 x18; s32 x1C; s32 x20; u8 padding[0x5C - 0x20]; diff --git a/src/melee/it/items/ithassam.c b/src/melee/it/items/ithassam.c index 1d4c0d5ae6..911967b407 100644 --- a/src/melee/it/items/ithassam.c +++ b/src/melee/it/items/ithassam.c @@ -196,7 +196,7 @@ void it_802CE008(Item_GObj* gobj) ip->entered_hitlag = efLib_PauseAll; ip->exited_hitlag = efLib_ResumeAll; it_8027A160(ip->xBBC_dynamicBoneTable->bones[2], ip); - ip->xD44_lifeTimer = M2C_FIELD(attr, s32*, 0x18); + ip->xD44_lifeTimer = attr->x18; ip->x40_vel.x = attr->x4 * ip->facing_dir; ip->xDD4_itemVar.hassam.x5C.x = attr->x4 * ip->facing_dir; ip->xDD4_itemVar.hassam.x5C.z = ip->xDD4_itemVar.hassam.x5C.y = 0.0F;