Even more

src/enemy/cloudPiranha.c

@@ -90,7 +90,7 @@ void CloudPiranha_Init(CloudPiranhaEntity* this) {
     super->animationState = super->direction >> 2;
     super->flags |= ENT_COLLIDE;
     super->timer = 0;
-    super->subtimer = 0x20;
+    super->subtimer = 32;
     this->unk_82 = 0;
     this->unk_80 = Random() & 1;
     this->unk_81 = 0;
@@ -103,7 +103,7 @@ void CloudPiranha_Action1(CloudPiranhaEntity* this) {
     sub_080387F0(this);
     if (--super->subtimer == 0) {
         super->timer = 0;
-        super->subtimer = 0x20;
+        super->subtimer = 32;
         if (sub_08049FA0(super)) {
             u32 tmp = super->animationState;
             if (this->unk_80 != 0) {
@@ -120,7 +120,7 @@ void CloudPiranha_Action1(CloudPiranhaEntity* this) {
         InitializeAnimation(super, (u32)super->animationState);
     } else if ((super->timer == 0) && sub_0803872C(this, 0x80)) {
         super->action = 2;
-        super->subtimer = 0x10;
+        super->subtimer = 16;
         super->speed = 0x40;
         super->animationState = sub_0806FCAC(super, super->child);
         super->direction = super->animationState << 2;
@@ -140,7 +140,7 @@ void sub_080385CC(CloudPiranhaEntity* this) {
         InitializeAnimation(super, super->animationState);
     } else {
         if (--super->subtimer == 0) {
-            super->subtimer = 0x10;
+            super->subtimer = 16;
             if (super->child != NULL) {
                 super->animationState = sub_0806FCAC(super, super->child);
             } else {
@@ -160,7 +160,7 @@ void CloudPiranha_Action3(CloudPiranhaEntity* this) {
         sub_08038754(this);
     } else {
         if (--super->subtimer == 0) {
-            super->subtimer = 0xa;
+            super->subtimer = 10;
             if (this->unk_81 == 0) {
                 tmp = super->speed += 0x40;
                 if (0x2000000 < (tmp * 0x10000)) {

src/enemy/crow.c

@@ -42,7 +42,7 @@ void Crow_OnCollision(CrowEntity* this) {
     if (super->contactFlags & 0x80) {
         if ((super->contactFlags & 0x3f) == 0) {
             COLLISION_OFF(super);
-            super->subtimer = 0x10;
+            super->subtimer = 16;
             if (DirectionIsHorizontal(DirectionRoundUp(super->direction)) == 0) {
                 if (DirectionIsVertical(super->direction)) {
                     super->direction += 2;

src/enemy/gyorgFemale.c

@@ -132,7 +132,7 @@ void GyorgFemale_Action1(GyorgFemaleEntity* this) {
     }
     if (((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x100) {
         if (--this->childrenSpawnTimer == 0) {
-            this->childrenSpawnTimer = 0x168;
+            this->childrenSpawnTimer = 360;
             GyorgFemale_SpawnChildren(this, TRUE);
         }
     }
@@ -160,7 +160,7 @@ void GyorgFemale_Action2(GyorgFemaleEntity* this) {
         }
     }
     if (((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x80 && --this->childrenSpawnTimer == 0) {
-        this->childrenSpawnTimer = 0x168;
+        this->childrenSpawnTimer = 360;
         GyorgFemale_SpawnChildren(this, 0);
     }
     if ((((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x38) == 0) {
@@ -176,7 +176,7 @@ void GyorgFemale_Action2(GyorgFemaleEntity* this) {
 void GyorgFemale_Action3(GyorgFemaleEntity* this) {
     sub_080465C8();
     if (--this->childrenSpawnTimer == 0) {
-        this->childrenSpawnTimer = 0x168;
+        this->childrenSpawnTimer = 360;
         GyorgFemale_SpawnChildren(this, 1);
     }
     GyorgFemale_ProcessEyeHit(this);

src/enemy/mulldozer.c

@@ -234,7 +234,7 @@ void sub_08032F90(MulldozerEntity* this) {
 
 void sub_08033000(MulldozerEntity* this) {
     if (--super->subtimer == 0) {
-        super->subtimer = 0x10;
+        super->subtimer = 16;
         if ((this->unk_82 & 0x80) != 0) {
             super->direction = (super->direction + 0x18) & 0x1c;
             this->unk_82 &= 0x7f;

src/enemy/octorokBoss.c

@@ -228,7 +228,7 @@ void OctorokBoss_Hit_SubAction2(OctorokBossEntity* this) {
         this->heap->tailObjects[0]->currentAttack++;
     } else {
         super->subAction = 3;
-        this->timer = 0x96;
+        this->timer = 150;
         gRoomControls.camera_target = &gPlayerEntity;
     }
 }
@@ -380,7 +380,7 @@ void OctorokBoss_Intro_SubAction3(OctorokBossEntity* this) {
 void OctorokBoss_Intro_SubAction4(OctorokBossEntity* this) {
     if (this->timer-- == 0) {
         super->subAction = 5;
-        this->timer = 0x2d;
+        this->timer = 45;;
         // Make the player look towards the exit
         gPlayerEntity.animationState = 0;
     } else {
@@ -692,7 +692,7 @@ void OctorokBoss_Action1_Attack_Type2_0(OctorokBossEntity* this) {
         this->angularSpeed.HWORD = 0x100;
         super->type2 = 1;
         if (IS_FROZEN(this) == FALSE) {
-            this->timer = 0x16;
+            this->timer = 22;
         } else {
             this->timer = 0;
         }
@@ -715,7 +715,7 @@ void OctorokBoss_Action1_Attack_Type2_1(OctorokBossEntity* this) {
                 this->heap->targetAngle = this->angle.HALF.HI;
             } else {
                 super->type2 = 2;
-                this->timer = 0x2d;
+                this->timer = 45;;
             }
             SoundReq(SFX_155);
         }
@@ -813,7 +813,7 @@ void OctorokBoss_ExecuteAttackVacuum(OctorokBossEntity* this) {
             if (this->unk_80 == 1) {
                 this->unk_80 = 2;
                 super->type2 = 2;
-                this->timer = 0x2d;
+                this->timer = 45;;
                 this->angularSpeed.HWORD = 0x100;
                 this->heap->field_0x2 = 0;
                 return;

src/enemy/pesto.c

@@ -159,7 +159,7 @@ void sub_080240B8(Entity* this) {
     this->field_0x86.HALF.LO = 0;
     this->field_0x86.HALF.HI = 0;
     this->timer = 0;
-    this->subtimer = 0x20;
+    this->subtimer = 32;
     this->collisionFlags |= 0x10;
     this->gustJarFlags = 2;
     this->direction = direction;
@@ -763,7 +763,7 @@ void sub_08024D00(Entity* this) {
                         this->direction += this->field_0x80.HALF.HI ? 1 : 0x1f;
                         this->direction &= 0x1f;
 
-                        this->subtimer = 0x10;
+                        this->subtimer = 16;
                         sub_080249DC(this);
                     }
                 }

src/enemy/puffstool.c

@@ -295,7 +295,7 @@ void sub_08025514(Entity* this) {
         this->field_0x80.HALF.HI = 120;
     } else if (3 < this->timer) {
         this->action = 10;
-        this->timer = 0x20;
+        this->timer = 32;
     }
 }
 

src/enemy/scissorsBeetle.c

@@ -112,18 +112,18 @@ void sub_08038A70(ScissorsBeetleEntity* this) {
         super->action = 3;
         this->unk_82 = 4;
         super->speed = 0x80;
-        super->subtimer = 0x20;
+        super->subtimer = 32;
         child->action = 3;
         ((ScissorsBeetleEntity*)child)->unk_82 = 2;
         child->animationState = 0xff;
         sub_08038C84(this, 0);
         sub_08038C2C((ScissorsBeetleEntity*)child);
-        child->subtimer = 0x20;
+        child->subtimer = 32;
         child->parent = NULL;
         child->child = super;
     } else if (--super->subtimer == 0) {
         u32 dir;
-        super->subtimer = 0x10;
+        super->subtimer = 16;
         super->direction = sub_08049F84(super, 0);
         dir = (super->direction + 4) & 0x1c;
         child->animationState = dir >> 2;

src/enemy/smallPesto.c

@@ -135,7 +135,7 @@ void sub_080317F8(Entity* this) {
     this->hitbox = (Hitbox*)&gUnk_080CE560;
     sub_080317E0(this);
     this->timer = 0;
-    this->subtimer = 0x20;
+    this->subtimer = 32;
 }
 
 void sub_08031840(Entity* this) {

src/enemy/spearMoblin.c

@@ -316,7 +316,7 @@ void sub_08028784(Entity* this) {
 
 void sub_080287B4(Entity* this) {
     this->action = 3;
-    this->timer = 0x20;
+    this->timer = 32;
     this->subtimer = 0;
     this->field_0x80.HALF.LO = 0;
     this->field_0x7a.HALF.HI = 0;

src/enemy/spikedBeetle.c

@@ -156,7 +156,7 @@ void sub_0802B8B0(Entity* this) {
     switch (sub_080044EC(this, 0x1800)) {
         case 0:
             this->action = 7;
-            this->timer = 0x96;
+            this->timer = 150;
             /* fallthrough */
         case 1:
             EnqueueSFX(SFX_12B);

src/enemy/spinyBeetle.c

@@ -52,7 +52,7 @@ void SpinyBeetle_OnCollision(SpinyBeetleEntity* this) {
         if ((super->contactFlags & 0x3f) == 0x14 && super->action != 5) {
             super->action = 3;
             super->timer = 0x5a;
-            super->subtimer = 0x10;
+            super->subtimer = 16;
             super->spritePriority.b1 = 1;
             super->direction = DirectionRoundUp(sub_08049F84(super, 1));
             sub_08033D78(this);
@@ -176,7 +176,7 @@ void sub_08033A7C(SpinyBeetleEntity* this) {
 
     super->action = 3;
     super->timer = 120;
-    super->subtimer = 0x20;
+    super->subtimer = 32;
     super->spritePriority.b1 = 1;
     InitializeAnimation(super, 3);
 }
@@ -361,7 +361,7 @@ void sub_08033E1C(SpinyBeetleEntity* this) {
     super->y.WORD = (super->y.WORD & 0xfff00000) | 0xC0000;
     super->hitType = 0x19;
     super->spritePriority.b1 = 1;
-    super->timer = 0x30;
+    super->timer = 48;
     super->subtimer = 0;
     super->speed = 0x100;
     super->child = NULL;

src/enemy/stalfos.c

@@ -176,8 +176,7 @@ void Stalfos_Init(StalfosEntity* this) {
 void Stalfos_Action1(StalfosEntity* this) {
     if (GravityUpdate(super, Q_8_8(24.0)) == 0 && sub_08039758(this) == 0 && --this->unk_78 == 0) {
         super->action = 2;
-        super->timer = 0xa;
-        sub_08039858(this);
+        super->timer = 10;        sub_08039858(this);
     }
 }
 
@@ -228,8 +227,7 @@ void Stalfos_Action6(StalfosEntity* this) {
         tmp = super->z.HALF.HI += 4;
         if (-1 < (tmp * 0x10000)) {
             super->action = 7;
-            super->timer = 0xa;
-            super->z.HALF.HI = 0;
+            super->timer = 10;            super->z.HALF.HI = 0;
             this->unk_7a = 0x78;
             this->unk_7c = 0x3c;
             sub_080399C4(this);

src/enemy/takkuri.c

@@ -137,7 +137,7 @@ void sub_0803BD08(TakkuriEntity* this) {
             if (gUnk_020000B0->y.HALF.HI > super->y.HALF.HI + 8) {
                 super->action = 2;
                 this->unk_0x84 = 0;
-                super->timer = 0x10;
+                super->timer = 16;
                 this->unk_0x81 = 2;
                 sub_0803BF2C(this);
             }

src/enemy/tektite.c

@@ -120,14 +120,14 @@ void sub_0802F284(Entity* this) {
     } else if (this->subtimer != 0) {
         if (this->frame & ANIM_DONE) {
             this->action = 2;
-            this->timer = 0x10;
+            this->timer = 16;
             this->subtimer = this->type;
             this->zVelocity = this->field_0x82.HWORD << 4;
             sub_0802F45C(this);
             InitializeAnimation(this, 2);
         }
     } else if (this->frame & ANIM_DONE) {
-        this->subtimer = 0x40;
+        this->subtimer = 64;
         InitializeAnimation(this, 1);
     }
 }
@@ -163,7 +163,7 @@ void sub_0802F300(Entity* this) {
     }
 
     if (--this->timer == 0) {
-        this->timer = 0x10;
+        this->timer = 16;
         if (this->subtimer != 0) {
             this->subtimer--;
             sub_0802F45C(this);
@@ -191,7 +191,7 @@ void sub_0802F3F4(Entity* this) {
     if (this->frame & ANIM_DONE) {
         if ((*(u8*)&this->field_0x7c.HALF.LO < 2) && ((this->type % 2) != 0)) {
             this->action = 2;
-            this->timer = 0x10;
+            this->timer = 16;
             this->subtimer = this->type;
             this->zVelocity = this->field_0x82.HWORD << 4;
             (*(u8*)&this->field_0x7c.HALF.LO)++;

src/enemy/tektiteGolden.c

@@ -112,7 +112,7 @@ void sub_08037Fe0(Entity* this) {
             InitializeAnimation(this, 2);
         }
     } else if (this->frame & ANIM_DONE) {
-        this->subtimer = 0x40;
+        this->subtimer = 64;
         InitializeAnimation(this, 1);
     }
 }

src/enemy/vaatiRebornEnemy.c

@@ -148,7 +148,7 @@ void VaatiRebornEnemyType0Action1(Entity* this) {
                     if (this->field_0x74.HALF.HI != 0) {
                         this->action = 2;
                         this->field_0x74.HALF.LO = 0;
-                        this->timer = 0x10;
+                        this->timer = 16;
                         this->direction = 0xff;
                     } else {
                         if ((this->field_0x86.HALF.LO != 0) || (this->field_0x80.HALF.LO != 0)) {
@@ -189,12 +189,12 @@ void VaatiRebornEnemyType0Action1(Entity* this) {
                 case 3:
                     this->action = 5;
                     this->field_0x74.HALF.LO = 0;
-                    this->subtimer = 0x20;
+                    this->subtimer = 32;
                     this->direction = 0xff;
                     break;
                 case 2:
                     this->field_0x74.HALF.LO = 0;
-                    this->timer = 0x20;
+                    this->timer = 32;
                     if ((this->field_0x86.HALF.LO != 0) || (this->field_0x80.HALF.LO != 0)) {
                         this->direction = ((Random() & 0x80) >> 3) | 8;
                     } else {
@@ -229,7 +229,7 @@ void VaatiRebornEnemyType0Action2(Entity* this) {
         case 0:
             if (--this->timer == 0) {
                 this->field_0x74.HALF.LO++;
-                this->timer = 0x20;
+                this->timer = 32;
                 InitAnimationForceUpdate(this, 3);
                 SoundReq(SFX_19B);
             }
@@ -238,7 +238,7 @@ void VaatiRebornEnemyType0Action2(Entity* this) {
             if ((this->frame & ANIM_DONE) != 0) {
                 this->field_0x74.HALF.LO = 2;
                 this->spriteSettings.draw = 0;
-                this->timer = 0x10;
+                this->timer = 16;
             }
             break;
         case 2:
@@ -254,7 +254,7 @@ void VaatiRebornEnemyType0Action2(Entity* this) {
                     this->y.HALF.HI = gRoomControls.origin_y + ptr->HALF.y + 0x10;
                 }
                 this->spriteSettings.draw = 1;
-                this->timer = 0x20;
+                this->timer = 32;
                 InitAnimationForceUpdate(this, 4);
                 SoundReq(SFX_F5);
             }
@@ -271,7 +271,7 @@ void VaatiRebornEnemyType0Action2(Entity* this) {
                     this->timer = 1;
                 } else {
                     this->field_0x74.HALF.LO = 0;
-                    this->timer = 0x10;
+                    this->timer = 16;
                 }
                 InitAnimationForceUpdate(this, 0);
             }
@@ -398,7 +398,7 @@ void VaatiRebornEnemyType0Action5(Entity* this) {
                 } else {
                     this->field_0x74.HALF.LO++;
                     this->field_0x86.HALF.HI = 0;
-                    this->subtimer = 0x30;
+                    this->subtimer = 48;
                     InitAnimationForceUpdate(this, 0);
                 }
             }

src/enemy/vaatiTransfigured.c

@@ -304,7 +304,7 @@ void VaatiTransfiguredType0Action3(Entity* this) {
             this->child->field_0x74.HALF.LO = 0x10;
             if (this->timer) {
                 this->field_0x80.HALF.LO = 3;
-                this->timer = 0x40;
+                this->timer = 64;
             } else {
                 this->field_0x80.HALF.LO = 4;
                 this->timer = 0x50;
@@ -315,13 +315,13 @@ void VaatiTransfiguredType0Action3(Entity* this) {
                 if (--this->timer == 0) {
                     COLLISION_OFF(this);
                     this->zVelocity = Q_16_16(3.5);
-                    this->subtimer = 0x10;
+                    this->subtimer = 16;
                 }
                 break;
             }
             if (GravityUpdate(this, Q_8_8(40.0)) == 0) {
                 this->field_0x80.HALF.LO = 5;
-                this->timer = 0x10;
+                this->timer = 16;
                 COLLISION_ON(this);
                 this->health = 0xff;
                 this->field_0x86.HALF.LO = 0;
@@ -343,7 +343,7 @@ void VaatiTransfiguredType0Action3(Entity* this) {
         case 4:
             if (--this->timer == 0) {
                 this->field_0x80.HALF.LO = 5;
-                this->timer = 0x10;
+                this->timer = 16;
                 this->field_0x86.HALF.LO = 0;
                 sub_080408EC(this);
             } else {
@@ -445,7 +445,7 @@ void VaatiTransfiguredType0Action5(Entity* this) {
         case 0:
             if (--this->timer == 0) {
                 this->field_0x80.HALF.LO += 1;
-                this->timer = 0x40;
+                this->timer = 64;
                 if (1 < this->animationState) {
                     this->timer = 0x80;
                     this->subtimer = 1;
@@ -462,7 +462,7 @@ void VaatiTransfiguredType0Action5(Entity* this) {
                         CreateProjectileWithParent(this, V2_PROJECTILE, this->subtimer);
                     }
                     if (this->timer < 6) {
-                        this->timer = 0x40;
+                        this->timer = 64;
                         this->subtimer = 0;
                     }
                 } else {
@@ -689,7 +689,7 @@ void VaatiTransfiguredType2Action1(Entity* this) {
                 case 0x11:
                     if (--this->subtimer == 0) {
                         this->field_0x74.HALF.LO = 1;
-                        this->subtimer = 0x30;
+                        this->subtimer = 48;
                         InitAnimationForceUpdate(this, 8);
                     }
             }

src/enemy/vaatiTransfiguredEye.c

@@ -188,7 +188,7 @@ void VaatiTransfiguredEyeFunction0Action4(Entity* this) {
     sub_08045A28(this);
     if (this->subtimer == 0) {
         if ((this->frame & ANIM_DONE) != 0) {
-            this->subtimer = 0x20;
+            this->subtimer = 32;
         }
     } else {
         parent = this->parent;

src/enemy/vaatiWrath.c

@@ -645,7 +645,7 @@ void sub_08041D14(Entity* this) {
                 pEVar1 = CreateObject(OBJECT_B6, 1, 0);
                 pEVar1->parent = this;
                 this->subAction = 3;
-                this->timer = 0x96;
+                this->timer = 150;
                 this->subtimer = 0;
                 this->spriteSettings.draw = 0;
                 SoundReq(SFX_1C4);

src/enemy/wizzrobeFire.c

@@ -73,7 +73,7 @@ void WizzrobeFire_Action1(WizzrobeEntity* this) {
             if (--super->timer == 0) {
                 super->action = 2;
                 this->timer2 = 0;
-                super->timer = 0x20;
+                super->timer = 32;
                 tmp = super->direction >> 3;
                 child = super->child;
                 child->timer = 1;

src/enemy/wizzrobeIce.c

@@ -82,7 +82,7 @@ void WizzrobeIce_Action1(WizzrobeEntity* this) {
             if (--super->timer == 0) {
                 super->action = 2;
                 this->timer2 = 0;
-                super->timer = 0x20;
+                super->timer = 32;
                 tmp = super->direction >> 3;
                 child = super->child;
                 child->timer = 1;

src/enemy/wizzrobeWind.c

@@ -90,7 +90,7 @@ void WizzrobeWind_Action1(WizzrobeEntity* this) {
         case 0:
             if (--super->timer == 0) {
                 this->timer2++;
-                super->timer = 0x10;
+                super->timer = 16;
                 super->flags |= 0x80;
             }
             break;
@@ -174,7 +174,7 @@ void WizzrobeWind_Action3(WizzrobeEntity* this) {
         switch (this->timer2) {
             case 0:
                 this->timer2 = 1;
-                super->timer = 0x40;
+                super->timer = 64;
                 break;
             case 1:
                 if (--super->timer != 0) {