1 files changed, 9 insertions, 12 deletions

diff --git a/src/playerItem/playerItemGustBig.c b/src/playerItem/playerItemGustBig.c
index 228ca1a3..566ef948 100644
--- a/src/playerItem/playerItemGustBig.c
+++ b/src/playerItem/playerItemGustBig.c
@@ -85,7 +85,7 @@ void PlayerItemGustBig_Init(PlayerItemGustBigEntity* this) {
         super->child->spriteOffsetX = 0;
         super->child->spriteSettings.draw = 0;
     } else {
-        if (gPlayerState.field_0x1c == 0) {
+        if (gPlayerState.gustJarState == PL_JAR_NONE) {
             DeleteThisEntity();
         }
         super->action = 2;
@@ -93,14 +93,14 @@ void PlayerItemGustBig_Init(PlayerItemGustBigEntity* this) {
         super->spriteIndex = 0xa6;
         super->palette.raw = 0x33;
         super->spriteVramOffset = 0;
-        super->type = gPlayerState.gustJarSpeed - 1;
+        super->type = gPlayerState.gustJarCharge - 1;
         super->timer = gUnk_080B3DE0[super->type * 2];
         super->damage = gUnk_080B3DE0[super->type * 2 + 1];
         super->hurtType = 0x1b;
         super->hitbox = (Hitbox*)gUnk_080B3DE8[super->type];
-        gPlayerEntity.unk_70 = super;
+        gPlayerEntity.pulledJarEntity = super;
         sub_08078CD0(&gPlayerEntity.base);
-        gPlayerEntity.unk_70 = pEVar3;
+        gPlayerEntity.pulledJarEntity = pEVar3;
         InitializeAnimation(super, super->type + 10);
         sub_08018FA0(super);
     }
@@ -108,18 +108,15 @@ void PlayerItemGustBig_Init(PlayerItemGustBigEntity* this) {
 }
 
 void PlayerItemGustBig_Action1(PlayerItemGustBigEntity* this) {
-    u8 bVar1;
-
-    bVar1 = super->child->gustJarState & 4;
-    if (bVar1 == 0) {
-        gPlayerState.field_0x1c = bVar1;
+    if ((super->child->gustJarState & 4) == 0) {
+        gPlayerState.gustJarState = PL_JAR_NONE;
         DeleteThisEntity();
     }
-    switch (gPlayerState.field_0x1c) {
-        case 0:
+    switch (gPlayerState.gustJarState) {
+        case PL_JAR_NONE:
             PlayerItemGustBig_Action3(this);
             break;
-        case 5:
+        case PL_JAR_BLAST_UPDATE:
             super->child->subAction = 4;
             COLLISION_ON(super);
             super->action = 2;