Even more

src/object/barrelInside.c

@@ -9,7 +9,7 @@ void BarrelInside(Entity* this) {
         this->action = 1;
         this->spriteSettings.draw = 1;
         this->frameIndex = this->type;
-        this->timer = 0x10;
+        this->timer = 16;
         this->subtimer = 1;
         ptr = gUnk_08120C80 + this->type * 3;
         this->spriteRendering.b3 = *ptr;
@@ -19,7 +19,7 @@ void BarrelInside(Entity* this) {
 
     if (this->type == 4) {
         if (--this->timer == 0) {
-            this->timer = 0x10;
+            this->timer = 16;
             this->frameIndex = gUnk_08120C92[this->subtimer++];
             if (this->subtimer == 3) {
                 this->subtimer = 0;

src/object/beanstalk.c

@@ -174,7 +174,7 @@ void Beanstalk_Action1Type0SubAction0(BeanstalkEntity* this) {
             super->timer++;
         } else {
             InitAnimationForceUpdate(super, 1);
-            super->timer = 0x10;
+            super->timer = 16;
             super->subAction++;
         }
     }
@@ -182,7 +182,7 @@ void Beanstalk_Action1Type0SubAction0(BeanstalkEntity* this) {
 
 void Beanstalk_Action1Type0SubAction1(BeanstalkEntity* this) {
     if (super->timer-- == 0) {
-        super->timer = 0x10;
+        super->timer = 16;
         SoundReq(SFX_198);
     }
     UpdateAnimationSingleFrame(super);
@@ -206,7 +206,7 @@ void Beanstalk_Action1Type0SubAction1(BeanstalkEntity* this) {
 
 void Beanstalk_Action1Type0SubAction2(BeanstalkEntity* this) {
     if (super->timer-- == 0) {
-        super->timer = 0x10;
+        super->timer = 16;
         SoundReq(SFX_198);
     }
 }

src/object/bigVortex.c

@@ -46,7 +46,7 @@ void sub_08098D6C(Entity* this) {
 
     if (CheckFlags(this->field_0x86.HWORD)) {
         this->action = 2;
-        this->timer = 0x2d;
+        this->timer = 45;;
         ent = CreateFx(this, FX_BIG_EXPLOSION2, 0);
         if (ent != NULL) {
             ent->y.HALF.HI += 8;

src/object/blockPushed.c

@@ -38,7 +38,7 @@ void sub_08082EB4(BlockPushedEntity* this) {
         super->spriteSettings.draw = 1;
     }
     super->action = 1;
-    super->timer = 0x20;
+    super->timer = 32;
     super->speed = 0x80;
     super->spritePriority.b0 = 6;
     pos = COORD_TO_TILE(super);

src/object/button.c

@@ -52,8 +52,7 @@ void sub_08081FF8(Entity*);
 void sub_08081BAC(Entity* this) {
     if (sub_08081CB0(this)) {
         this->subAction = 0;
-        this->timer = 0xA;
-        RequestPriorityDuration(this, 0xA);
+        this->timer = 10;        RequestPriorityDuration(this, 0xA);
         sub_08081FF8(this);
         if (this->type == 1) {
             this->action = 3;

src/object/chestSpawner.c

@@ -167,7 +167,7 @@ void ChestSpawner_Type2Action4(ChestSpawnerEntity* this) {
             if (super->timer == 0x18) {
                 super->action = 6;
                 super->timer = 8;
-                super->subtimer = 0x10;
+                super->subtimer = 16;
             } else {
                 super->action = 5;
                 sub_08084074(super->type2);

src/object/ezloCap.c

@@ -73,8 +73,7 @@ void EzloCap_Type0Init(EzloCapEntity* this) {
         SoundReq(SFX_F3);
     } else {
         super->timer = 0;
-        super->subtimer = 0xa;
-        super->y.HALF.HI -= 0xe;
+        super->subtimer = 10;        super->y.HALF.HI -= 0xe;
         InitAnimationForceUpdate(super, 0x14);
     }
 }
@@ -129,8 +128,7 @@ void EzloCap_Type1Action1(EzloCapEntity* this) {
     if (super->subAction == 0) {
         if (super->subtimer-- == 0) {
             super->timer++;
-            super->subtimer = 0xa;
-            tmp = super->timer - 1;
+            super->subtimer = 10;            tmp = super->timer - 1;
             obj = CreateObjectWithParent(super, OBJECT_79, tmp, 0);
             super->child = obj;
             if (obj != NULL) {

src/object/fairy.c

@@ -154,7 +154,7 @@ void Fairy_Action2(FairyEntity* this) {
     if (--super->subtimer == 0) {
         u32 rand = Random();
         super->flags |= ENT_COLLIDE;
-        super->subtimer = 0x20;
+        super->subtimer = 32;
         super->speed = (u16)gUnk_081217A4[rand >> 8 & 1];
         if (sub_0808DAA0(this)) {
             super->direction = rand & 0x1f;

src/object/fourElements.c

@@ -93,7 +93,7 @@ void FourElements_Action2(FourElementsEntity* this) {
         DeleteEntity(super->child);
         super->spriteSettings.draw = 0;
         super->action = 3;
-        super->timer = 0x2d;
+        super->timer = 45;;
         gScreen.controls.layerFXControl = 0x640;
         gScreen.controls.alphaBlend = 0;
         InitItemGetSequence(super->type, 0, 1);

src/object/keyStealingTakkuri.c

@@ -92,7 +92,7 @@ void KeyStealingTakkuri_Type0_Action2(KeyStealingTakkuriEntity* this) {
     sub_0809E1F0(this);
     if ((s32)sub_080041DC(super, child->x.HALF.HI, child->y.HALF.HI) * 0x10 < super->speed) {
         super->action++;
-        super->timer = 0x10;
+        super->timer = 16;
         super->subtimer = 1;
         InitAnimationForceUpdate(super, 2);
     }
@@ -276,8 +276,7 @@ void KeyStealingTakkuri_Type3_Init(KeyStealingTakkuriEntity* this) {
 
     super->action++;
     super->collisionLayer = 2;
-    super->timer = 0xa;
-    super->subtimer = 0;
+    super->timer = 10;    super->subtimer = 0;
     super->spriteRendering.b3 = 1;
     super->speed = 0;
     super->direction = gUnk_0812412D[super->type2];
@@ -330,8 +329,7 @@ void KeyStealingTakkuri_Type3_Action1(KeyStealingTakkuriEntity* this) {
             }
             break;
         default:
-            super->timer = 0xa;
-            break;
+            super->timer = 10;            break;
     }
     UpdateAnimationSingleFrame(super);
 }

src/object/lightableSwitch.c

@@ -135,7 +135,7 @@ void sub_0809EB80(Entity* this) {
 void sub_0809EBD8(Entity* this) {
     if ((this->contactFlags & 0x80) != 0) {
         this->action = 2;
-        this->timer = 0x10;
+        this->timer = 16;
         this->frameIndex = 2;
         SetFlag(this->field_0x86.HWORD);
         EnqueueSFX(SFX_110);

src/object/macroMushroomStalks.c

@@ -71,21 +71,21 @@ void sub_0808CA10(Entity* this) {
     switch (this->type) {
         case 1:
             if (gUnk_02018EB0.unk_18 != 0) {
-                this->timer = 0x20;
+                this->timer = 32;
                 gUnk_02018EB0.unk_18 = 0;
                 SoundReq(SFX_12E);
             }
             break;
         case 2:
             if (gUnk_02018EB0.unk_19 != 0) {
-                this->timer = 0x20;
+                this->timer = 32;
                 gUnk_02018EB0.unk_19 = 0;
                 SoundReq(SFX_12E);
             }
             break;
         case 3:
             if (gUnk_02018EB0.unk_1a != 0) {
-                this->timer = 0x20;
+                this->timer = 32;
                 gUnk_02018EB0.unk_1a = 0;
                 SoundReq(SFX_12E);
             }

src/object/macroPlayer.c

@@ -189,7 +189,7 @@ void MacroPlayer_Type0_Action4(MacroPlayerEntity* this) {
 void MacroPlayer_Type0_Action5(MacroPlayerEntity* this) {
     if (--super->timer == 0) {
         super->action++;
-        super->timer = 0x10;
+        super->timer = 16;
     }
 }
 

src/object/minishLight.c

@@ -14,7 +14,7 @@ void MinishLight(Entity* this) {
 void sub_0809F840(Entity* this) {
     this->action = 1;
     this->frameIndex = 0;
-    this->timer = 0x20;
+    this->timer = 32;
     this->subtimer = 0;
 
     if (this->type2 != 0) {

src/object/object35.c

@@ -160,7 +160,7 @@ void Object35_Type2(Object35Entity* this) {
 
 void Object35_Type2Init(Object35Entity* this) {
     super->action = 1;
-    super->timer = 0x10;
+    super->timer = 16;
     super->z.HALF.HI -= 0x10;
     if (super->type2 == 0) {
         super->frameIndex = 2;

src/object/object8E.c

@@ -115,7 +115,7 @@ void Object8E_Type1(Object8EEntity* this) {
         case 0:
             super->action = 1;
             super->timer = 60;
-            super->subtimer = 0x20;
+            super->subtimer = 32;
             gRoomControls.camera_target = super;
             gRoomControls.unk5 = 1;
             if (super->x.HALF.HI > gPlayerEntity.x.HALF.HI) {

src/object/objectA8.c

@@ -147,7 +147,7 @@ void ObjectA8_Action3(ObjectA8Entity* this) {
     if (--super->subtimer == 0) {
         u32 rand = Random();
         super->flags |= ENT_COLLIDE;
-        super->subtimer = 0x20;
+        super->subtimer = 32;
         super->speed = gUnk_0812484C[rand >> 8 & 1];
         if (sub_0809FE9C(this)) {
             super->direction = rand & 0x1f;

src/object/objectB2.c

@@ -8,7 +8,7 @@ void ObjectB2(Entity* this) {
 
     if (this->action == 0) {
         this->action = 1;
-        this->timer = 0x10;
+        this->timer = 16;
         this->direction = this->type << 3;
         if (this->collisionLayer == 2) {
             collisionData = gMapTop.collisionData;

src/object/objectBlockingStairs.c

@@ -114,7 +114,7 @@ void ObjectBlockingStairs_Action1(ObjectBlockingStairsEntity* this) {
             super->action = 3;
             super->direction = Direction8FromAnimationState(gPlayerEntity.animationState);
             super->speed = 0x80;
-            super->timer = 0x40;
+            super->timer = 64;
             RequestPriorityDuration(super, 0x50);
             EnqueueSFX(SFX_10F);
             sub_08093248(this);
@@ -162,7 +162,7 @@ void ObjectBlockingStairs_Action2(ObjectBlockingStairsEntity* this) {
                 gPlayerEntity.x.HALF.LO = 0;
                 gPlayerEntity.y.HALF.LO = 0;
                 super->direction = (gPlayerEntity.animationState ^ 4) << 2;
-                super->timer = 0x40;
+                super->timer = 64;
                 EnqueueSFX(SFX_10F);
                 sub_08093248(this);
             }

src/object/pullableLever.c

@@ -229,7 +229,7 @@ void sub_0809153C(PullableLeverEntity* this) {
         SetFlag(this->pulledFlag);
     } else {
         if (--super->subtimer == 0) {
-            super->subtimer = 0x10;
+            super->subtimer = 16;
             EnqueueSFX(SFX_10F);
         }
     }

src/object/pushableFurniture.c

@@ -215,19 +215,19 @@ void sub_0808FD44(PushableFurnitureEntity* this, u32 param_2) {
         }
         if ((gPlayerState.flags & PL_MINISH) != 0) {
             super->speed = 0x40;
-            super->timer = 0x20;
+            super->timer = 32;
         } else {
             super->speed = 0x80;
-            super->timer = 0x10;
+            super->timer = 16;
         }
     } else {
         tmp = this->unk_7c;
         if ((gPlayerState.flags & PL_MINISH) != 0) {
             super->speed = 0x40;
-            super->timer = 0x40;
+            super->timer = 64;
         } else {
             super->speed = 0x80;
-            super->timer = 0x20;
+            super->timer = 32;
         }
     }
     EnqueueSFX(SFX_10F);

src/object/pushableGrave.c

@@ -152,7 +152,7 @@ bool32 sub_0809785C(PushableGraveEntity* this) {
         if (super->type2 != 0) {
             if ((CheckFlags(this->pushedFlag) != 0) || GetTileType(this->unk_68, super->collisionLayer) == 0x403f) {
                 super->action = 3;
-                super->timer = 0x40;
+                super->timer = 64;
                 super->subtimer = 0;
                 super->direction = 0;
                 super->speed = 0x40;

src/object/smallIceBlock.c

@@ -92,7 +92,7 @@ void SmallIceBlock_Action1(SmallIceBlockEntity* this) {
                 switch (sub_08099618(tileType)) {
                     case 1:
                         super->action = 2;
-                        super->timer = 0x16;
+                        super->timer = 22;
                         super->direction = ((tileType - 0x5b) & 3) << 3;
                         super->speed = 0x20;
                         sub_080994B8(this);

src/object/thoughtBubble.c

@@ -24,7 +24,7 @@ void ThoughtBubble_Init(Entity* this) {
     this->action = 1;
     this->spriteSettings.draw = 1;
     if (this->timer == 0) {
-        this->timer = 0x2d;
+        this->timer = 45;;
     }
     this->spriteOrientation.flipY = 1;
     InitializeAnimation(this, this->type2);