Rename objects

11 files changed, 21 insertions, 21 deletions

diff --git a/src/projectile/ballAndChain.c b/src/projectile/ballAndChain.c
index 110c80a0..32cfea4c 100644
--- a/src/projectile/ballAndChain.c
+++ b/src/projectile/ballAndChain.c
@@ -132,7 +132,7 @@ void sub_080AB26C(Entity* this) {
     if (--this->timer == 0) {
         DeleteThisEntity();
     } else {
-        this->frameIndex += 1;
+        this->frameIndex++;
     }
 }
 
diff --git a/src/projectile/darkNutSwordSlash.c b/src/projectile/darkNutSwordSlash.c
index e0f3d3af..700f9629 100644
--- a/src/projectile/darkNutSwordSlash.c
+++ b/src/projectile/darkNutSwordSlash.c
@@ -31,7 +31,7 @@ void DarkNutSwordSlash(Entity* this) {
     CopyPositionAndSpriteOffset(this->parent, this);
     DarkNutSwordSlash_OnTick(this);
     if (this->type == 3) {
-        this->y.HALF.HI += 1;
+        this->y.HALF.HI++;
         UpdateAnimationSingleFrame(this);
     }
 }
diff --git a/src/projectile/dirtBallProjectile.c b/src/projectile/dirtBallProjectile.c
index 97d7c34e..5118394c 100644
--- a/src/projectile/dirtBallProjectile.c
+++ b/src/projectile/dirtBallProjectile.c
@@ -85,7 +85,7 @@ void DirtBallProjectile_Action1(Entity* this) {
             CopyPosition(this, this->child);
             if ((0xf < (u8)(this->timer++ + 1)) && (entity = this->child, entity->timer == 0)) {
                 if ((this->timer & 2) != 0) {
-                    entity->subtimer += 1;
+                    entity->subtimer++;
                 }
                 if ((this->child->subtimer < 0x20) && ((this->child->subtimer & 3) == 3)) {
                     parent->field_0x82.HALF.HI = 0xc0;
diff --git a/src/projectile/guardLineOfSight.c b/src/projectile/guardLineOfSight.c
index a55ded6b..f6ffeaf0 100644
--- a/src/projectile/guardLineOfSight.c
+++ b/src/projectile/guardLineOfSight.c
@@ -28,7 +28,7 @@ void GuardLineOfSight(Entity* this) {
         }
         CopyPosition(this->parent, this);
         if (this->subtimer != 0) {
-            this->subtimer -= 1;
+            this->subtimer--;
         } else {
             if (sub_080644C8(this) != 0) {
                 if (((this->timer++) & 3) == 0) {
diff --git a/src/projectile/mandiblesProjectile.c b/src/projectile/mandiblesProjectile.c
index 976c096b..fd292039 100644
--- a/src/projectile/mandiblesProjectile.c
+++ b/src/projectile/mandiblesProjectile.c
@@ -82,7 +82,7 @@ void MandiblesProjectile_Init(Entity* this) {
 
 void MandiblesProjectile_Action1(Entity* this) {
     if (this->field_0x80.HWORD != 0) {
-        this->field_0x80.HWORD -= 1;
+        this->field_0x80.HWORD--;
     } else {
         if (--this->subtimer == 0) {
             sub_080AA270(this);
@@ -128,7 +128,7 @@ void MandiblesProjectile_Action3(Entity* this) {
     }
     if (entity->confusedTime == 0) {
         if (this->subtimer != 0) {
-            this->subtimer -= 1;
+            this->subtimer--;
         } else {
             UpdateAnimationSingleFrame(this);
             if ((this->frame & ANIM_DONE) != 0) {
@@ -164,7 +164,7 @@ void MandiblesProjectile_Action4(Entity* this) {
             this->child = NULL;
         }
         if (this->subtimer != 0) {
-            this->subtimer -= 1;
+            this->subtimer--;
         } else {
             if (sub_080AA374(this) != 0) {
                 if (entity->health == 0) {
diff --git a/src/projectile/mazaalEnergyBeam.c b/src/projectile/mazaalEnergyBeam.c
index 1584348c..21287caa 100644
--- a/src/projectile/mazaalEnergyBeam.c
+++ b/src/projectile/mazaalEnergyBeam.c
@@ -28,7 +28,7 @@ void MazaalEnergyBeam_Action1(Entity* this) {
         InitializeAnimation(this, 1);
     } else {
         if (this->z.HALF.HI != 0) {
-            this->z.HALF.HI += 1;
+            this->z.HALF.HI++;
         }
 
         tmp = &gSineTable[this->direction];
diff --git a/src/projectile/octorokBossProjectile.c b/src/projectile/octorokBossProjectile.c
index 6645191b..e25a0db8 100644
--- a/src/projectile/octorokBossProjectile.c
+++ b/src/projectile/octorokBossProjectile.c
@@ -100,7 +100,7 @@ void OctorokBossProjectile_Action1(Entity* this) {
                     this->direction ^= 0x80;
                     this->speed = 0x400;
                 } else {
-                    this->parent->health -= 1;
+                    this->parent->health--;
                     this->parent->iframes = 0x1e;
                     if (this->parent->field_0x7c.BYTES.byte0 != 0) {
                         this->parent->knockbackDuration = 0x18;
diff --git a/src/projectile/removableDust.c b/src/projectile/removableDust.c
index aa4054ec..7927339f 100644
--- a/src/projectile/removableDust.c
+++ b/src/projectile/removableDust.c
@@ -49,7 +49,7 @@ void sub_080AA464(Entity* this) {
     if (this->type == 0) {
         sub_080AA544(this);
     }
-    entity = CreateObject(OBJECT_21, 3, 0);
+    entity = CreateObject(DIRT_PARTICLE, 3, 0);
     if (entity != NULL) {
         CopyPosition(this, entity);
     }
@@ -68,7 +68,7 @@ void sub_080AA494(Entity* this) {
         if (*(iterator++) == tileType) {
             break;
         }
-        index += 1;
+        index++;
     }
     if (CheckFlags((u16)this->speed) != 0) {
         if (index == 4) {
@@ -103,9 +103,9 @@ void sub_080AA544(Entity* this) {
         do {
             iVar2 = sub_080B1AE0((param - tmp[uVar3]) & 0xffff, this->collisionLayer);
             if (iVar2 == 0x3e) {
-                iVar4 += 1;
+                iVar4++;
             }
-            uVar3 += 1;
+            uVar3++;
         } while (uVar3 < 9);
 
         if (iVar4 == 8) {
@@ -113,8 +113,8 @@ void sub_080AA544(Entity* this) {
             puVar5 = gUnk_08129FD0;
             do {
                 sub_0807B7D8((u32)*puVar5, param - tmp[uVar3], this->collisionLayer);
-                puVar5 += 1;
-                uVar3 += 1;
+                puVar5++;
+                uVar3++;
             } while (uVar3 < 9);
             sub_080AA654(this, param);
             SetFlag((u16)this->speed);
diff --git a/src/projectile/spiderWeb.c b/src/projectile/spiderWeb.c
index 14909320..36d91e19 100644
--- a/src/projectile/spiderWeb.c
+++ b/src/projectile/spiderWeb.c
@@ -50,7 +50,7 @@ void sub_080AA6C0(Entity* this) {
         this->timer = 90;
         COLLISION_OFF(this);
         InitAnimationForceUpdate(this, this->type + 0x10);
-        object = CreateObject(OBJECT_2A, 3, 0);
+        object = CreateObject(FLAME, 3, 0);
         if (object != NULL) {
             object->type2 = 0x5a;
             object->spritePriority.b0 = 3;
@@ -58,7 +58,7 @@ void sub_080AA6C0(Entity* this) {
             object->spriteOffsetY = typeSpritOffsets[this->type * 4 + 1];
             object->parent = this;
         }
-        object = CreateObject(OBJECT_2A, 3, 0);
+        object = CreateObject(FLAME, 3, 0);
         if (object != NULL) {
             object->type2 = 0x5a;
             object->spritePriority.b0 = 3;
@@ -204,14 +204,14 @@ void sub_080AA9E0(Entity* this) {
         case 0:
         case 3: {
             if (diff > 4) {
-                ptr += 1;
+                ptr++;
             }
             break;
         }
         case 1:
         case 2: {
             if (diff < -4) {
-                ptr += 1;
+                ptr++;
             }
             break;
         }
diff --git a/src/projectile/torchTrapProjectile.c b/src/projectile/torchTrapProjectile.c
index b3d86421..a42eee74 100644
--- a/src/projectile/torchTrapProjectile.c
+++ b/src/projectile/torchTrapProjectile.c
@@ -27,7 +27,7 @@ void TorchTrapProjectile_Init(Entity* this) {
 void TorchTrapProjectile_Action1(Entity* this) {
     GetNextFrame(this);
     if (this->timer != 0) {
-        this->timer -= 1;
+        this->timer--;
     } else {
         if (ProcessMovement3(this) == 0) {
             LinearMoveUpdate(this);
diff --git a/src/projectile/v1EyeLaser.c b/src/projectile/v1EyeLaser.c
index af8ec1bd..a94c71bb 100644
--- a/src/projectile/v1EyeLaser.c
+++ b/src/projectile/v1EyeLaser.c
@@ -107,7 +107,7 @@ void sub_080AB844(Entity* this, s32 param_1, s32 param_2) {
 void sub_080AB888(Entity* this) {
     s32 index;
 
-    this->subtimer -= 1;
+    this->subtimer--;
     index = 0;
 
     switch (this->timer) {