cleanup

src/playerItem/playerItem11.c

@@ -55,7 +55,7 @@ void sub_08018CBC(Entity* this) {
         this->spriteIndex = 0xa6;
         this->palette.raw = 0x33;
         this->spriteVramOffset = 0;
-        this->type = gPlayerState.field_0x1d - 1;
+        this->type = gPlayerState.gustJarSpeed - 1;
         this->actionDelay = gUnk_080B3DE0[this->type * 2];
         this->damage = gUnk_080B3DE0[this->type * 2 + 1];
         this->hurtType = 0x1b;

src/playerItem/playerItem12.c

@@ -109,7 +109,7 @@ void sub_080701F8(Entity* this) {
         }
         if (sub_080B1BA4(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) == 0) {
             if (sub_080040D8(this, &gUnk_08003E44, this->x.HALF.HI, this->y.HALF.HI) == 0) {
-                if (sub_080B1AA8(this) == 0x19) {
+                if (GetTileUnderEntity(this) == 0x19) {
                     this->action = 4;
                     COLLISION_OFF(this);
                     this->x.HALF.HI = (this->x.HALF.HI & 0xfff0) | 8;
@@ -132,7 +132,7 @@ void sub_080701F8(Entity* this) {
 
 void sub_0807037C(Entity* this) {
     GetNextFrame(this);
-    if ((this->frame & 0x80) != 0) {
+    if ((this->frame & ANIM_DONE) != 0) {
         DeleteThisEntity();
     }
 }

src/playerItem/playerItem3.c

@@ -34,7 +34,7 @@ void PlayerItem3(Entity* this) {
         } else {
             this->field_0x86.HWORD -= 0x2000;
         }
-        sub_0805EC9C(this, 0x100, 0x100, this->field_0x86.HWORD);
+        SetAffineInfo(this, 0x100, 0x100, this->field_0x86.HWORD);
     }
 
     this->field_0xf--;

src/playerItem/playerItemBomb.c

@@ -24,7 +24,7 @@ void PlayerItemBomb(Entity* this) {
                 this->field_0xf = 0x50;
                 *(u32*)&this->field_0x68 = 0;
                 this->spriteRendering.b0 = 3;
-                sub_0805EC9C(this, 0x100, 0x100, 0);
+                SetAffineInfo(this, 0x100, 0x100, 0);
             }
         } else {
             if (this->field_0xf != 0) {
@@ -37,7 +37,7 @@ void PlayerItemBomb(Entity* this) {
                     this->actionDelay = 0x0f;
                     this->spriteSettings.draw = 0;
                     sub_0805EC60(this);
-                    sub_08078954(this);
+                    FreeCarryEntity(this);
                     CreateObjectWithParent(this, 0x20, 0, 0);
                     sub_0801B418(this);
                 } else {

src/playerItem/playerItemBottle.c

@@ -14,7 +14,6 @@ void PlayerItemBottle_UseOther(Entity*);
 void PlayerItemBottle_Init(Entity*);
 
 extern u32 SetBottleContents(u32 itemID, u32 bottleIndex);
-extern bool32 AllocMutableHitbox(Entity*);
 extern void sub_0801B9F0(Entity* this);
 
 void PlayerItemBottle(Entity* this) {
@@ -37,7 +36,7 @@ void PlayerItemBottle_Init(Entity* this) {
     this->field_0x6e.HALF.HI = bottleType;
     switch (bottleType) {
         case ITEM_BOTTLE_EMPTY:
-            if (AllocMutableHitbox(this) == 0) {
+            if (AllocMutableHitbox(this) == NULL) {
                 return;
             }
             COLLISION_ON(this);

src/playerItem/playerItemGustJar.c

@@ -41,7 +41,7 @@ void PlayerItemGustJar_Init(Entity* this) {
 
 void PlayerItemGustJar_Action1(Entity* this) {
     sub_080ADC84(this);
-    if ((this->frame & 0x80) != 0) {
+    if ((this->frame & ANIM_DONE) != 0) {
         this->action = 2;
         sub_080ADCA0(this, 0);
     } else {
@@ -78,7 +78,7 @@ void PlayerItemGustJar_Action2(Entity* this) {
                 this->frameDuration = 0x7f;
             }
 
-            switch (gPlayerState.field_0x1d) {
+            switch (gPlayerState.gustJarSpeed) {
                 case 3:
                     sub_080ADCDC(this, 3);
                     this->palette.b.b0 = 0;
@@ -132,7 +132,7 @@ void PlayerItemGustJar_Action3(Entity* this) {
 }
 
 void PlayerItemGustJar_Action4(Entity* this) {
-    if ((this->frame & 0x80) != 0) {
+    if ((this->frame & ANIM_DONE) != 0) {
         this->spriteSettings.draw = 0;
     } else {
         UpdateAnimationSingleFrame(this);

src/playerItem/playerItemLantern.c

@@ -4,7 +4,6 @@
 
 extern void (*const gUnk_080FEEA8[])(Entity*);
 
-extern bool32 AllocMutableHitbox(Entity*);
 void sub_08054AC8(Entity*);
 
 void PlayerItemLantern(Entity* this) {
@@ -22,7 +21,7 @@ void sub_08054A60(Entity* this) {
     this->field_0x3c = 7;
     this->flags2 = -0x80;
     this->animationState = gPlayerEntity.animationState & 0xe;
-    if (AllocMutableHitbox(this) == FALSE) {
+    if (AllocMutableHitbox(this) == NULL) {
         DeleteThisEntity();
     }
     sub_0801766C(this);

src/playerItem/playerItemPacciCane.c

@@ -29,7 +29,7 @@ void PlayerItemPacciCane_Action1(Entity* this) {
     u32 playerFrame;
     u32 frameIndex;
     u32 flipX;
-    if (((gPlayerEntity.frame & 0x80) != 0) || (this != gPlayerState.item)) {
+    if (((gPlayerEntity.frame & ANIM_DONE) != 0) || (this != gPlayerState.item)) {
         if (this == gPlayerState.item) {
             gPlayerState.item = NULL;
         }