Should be the rest of them

32 files changed, 70 insertions, 67 deletions

diff --git a/src/object/beanstalk.c b/src/object/beanstalk.c
index 07262a6a..48d3ac96 100644
--- a/src/object/beanstalk.c
+++ b/src/object/beanstalk.c
@@ -319,7 +319,7 @@ void Beanstalk_Action1Type8SubAction0(BeanstalkEntity* this) {
         obj->spriteVramOffset = super->spriteVramOffset;
         obj->palette.b.b0 = super->palette.b.b0;
         obj->animIndex = 2;
-        obj->timer = 0x80;
+        obj->timer = 128;
         obj->type = 1;
         obj->spriteRendering.b3 = 2;
         obj->spritePriority.b0 = 6;
diff --git a/src/object/bird.c b/src/object/bird.c
index 0ec0b1b6..ccf85c34 100644
--- a/src/object/bird.c
+++ b/src/object/bird.c
@@ -46,7 +46,7 @@ void Bird_Type0_Init(Entity* this) {
 
     this->action++;
     this->spriteSettings.draw = TRUE;
-    this->timer = 0x31;
+    this->timer = 49;
     this->subtimer = 1;
     this->zVelocity = Q_16_16(-1.5);
     this->z.WORD = Q_16_16(-56.75);
diff --git a/src/object/bossDoor.c b/src/object/bossDoor.c
index dd199b79..c24d41ff 100644
--- a/src/object/bossDoor.c
+++ b/src/object/bossDoor.c
@@ -120,7 +120,7 @@ void BossDoor_Action4(BossDoorEntity* this) {
 
     if (sub_08083734(super, this->unk_76)) {
         super->action = 5;
-        super->timer = 0xc;
+        super->timer = 12;
         super->spriteSettings.draw = 1;
         super->direction = *(u8*)&this->unk_76 << 3 ^ 0x10;
         ptr = &gUnk_081214F4[this->unk_76 * 2];
@@ -166,7 +166,7 @@ void sub_0808C4BC(BossDoorEntity* this) {
     static const s8 gUnk_0812150C[] = { 0, -2, 2, 0, 0, 2, -2, 0 };
     const s8* ptr;
     super->action = 3;
-    super->timer = 0xc;
+    super->timer = 12;
     super->direction = this->unk_76 * 8;
     ptr = &gUnk_0812150C[this->unk_76 * 2];
     super->x.HALF.HI += ptr[0];
diff --git a/src/object/button.c b/src/object/button.c
index d4549f1a..b80f5c8c 100644
--- a/src/object/button.c
+++ b/src/object/button.c
@@ -52,7 +52,8 @@ void sub_08081FF8(Entity*);
 void sub_08081BAC(Entity* this) {
     if (sub_08081CB0(this)) {
         this->subAction = 0;
-        this->timer = 10;        RequestPriorityDuration(this, 0xA);
+        this->timer = 10;
+        RequestPriorityDuration(this, 0xA);
         sub_08081FF8(this);
         if (this->type == 1) {
             this->action = 3;
@@ -73,9 +74,9 @@ void sub_08081BE0(Entity* this) {
         this->action = 4;
         this->subtimer = 1;
         if ((gPlayerState.heldObject == 2) || (!(gPlayerState.field_0x35 & 0x80))) {
-            this->timer = 0x18;
+            this->timer = 24;
         } else {
-            this->timer = 0x8;
+            this->timer = 8;
         }
     } else {
         sub_08081E6C(this);
diff --git a/src/object/crenelBeanSprout.c b/src/object/crenelBeanSprout.c
index 28e4d97e..f0cf844d 100644
--- a/src/object/crenelBeanSprout.c
+++ b/src/object/crenelBeanSprout.c
@@ -247,7 +247,7 @@ void CrenelBeanSprout_Action4(CrenelBeanSproutEntity* this) {
             CreateDust(super);
         }
     } else {
-        super->timer = 0xc0;
+        super->timer = 192;
     }
 }
 
@@ -274,12 +274,10 @@ void CrenelBeanSprout_Action6(CrenelBeanSproutEntity* this) {
 }
 
 void CrenelBeanSprout_Action6SubAction0(CrenelBeanSproutEntity* this) {
-    static const u8 gUnk_081231AC[] = {
-        2,
-        3,
-    };
+    static const u8 gUnk_081231AC[] = { 2, 3 };
+
     SetLocalFlag(super->type2);
-    super->timer = 0x0f;
+    super->timer = 15;
     super->subtimer = gUnk_081231AC[super->type >> 1];
     super->type2 = 0;
     super->spriteSettings.draw = 0;
@@ -303,7 +301,7 @@ void CrenelBeanSprout_Action6SubAction1(CrenelBeanSproutEntity* this) {
             super->subAction++;
             super->timer = 60;
         } else {
-            super->timer = 0x0f;
+            super->timer = 15;
         }
     }
 }
diff --git a/src/object/ezloCap.c b/src/object/ezloCap.c
index 1d8c0e88..272e0b3a 100644
--- a/src/object/ezloCap.c
+++ b/src/object/ezloCap.c
@@ -73,7 +73,8 @@ void EzloCap_Type0Init(EzloCapEntity* this) {
         SoundReq(SFX_F3);
     } else {
         super->timer = 0;
-        super->subtimer = 10;        super->y.HALF.HI -= 0xe;
+        super->subtimer = 10;
+        super->y.HALF.HI -= 0xe;
         InitAnimationForceUpdate(super, 0x14);
     }
 }
@@ -128,7 +129,8 @@ void EzloCap_Type1Action1(EzloCapEntity* this) {
     if (super->subAction == 0) {
         if (super->subtimer-- == 0) {
             super->timer++;
-            super->subtimer = 10;            tmp = super->timer - 1;
+            super->subtimer = 10;
+            tmp = super->timer - 1;
             obj = CreateObjectWithParent(super, OBJECT_79, tmp, 0);
             super->child = obj;
             if (obj != NULL) {
diff --git a/src/object/fairy.c b/src/object/fairy.c
index a5cca8b0..aac60b8b 100644
--- a/src/object/fairy.c
+++ b/src/object/fairy.c
@@ -240,7 +240,7 @@ void sub_0808DAD0(FairyEntity* this) {
         DeleteThisEntity();
     }
     super->action = 4;
-    super->timer = 0x80;
+    super->timer = 128;
     super->subtimer = 6;
     super->flags &= ~ENT_COLLIDE;
     super->spriteSettings.draw = 1;
diff --git a/src/object/figurineDevice.c b/src/object/figurineDevice.c
index 7d077627..0f2ae319 100644
--- a/src/object/figurineDevice.c
+++ b/src/object/figurineDevice.c
@@ -199,7 +199,7 @@ void FigurineDevice_Action3(FigurineDeviceEntity* this) {
         case 0:
             if ((super->frame & ANIM_DONE) != 0) {
                 this->unk_7a = 1;
-                super->timer = 0x28;
+                super->timer = 40;
                 ChangeObjPalette(super, gUnk_08120AA8[super->type2]);
                 InitializeAnimation(super, 2);
                 SoundReq(SFX_110);
@@ -323,7 +323,7 @@ ASM_FUNC("asm/non_matching/figurineDevice/sub_08087F94.inc", void sub_08087F94(F
 
 void sub_08088034(FigurineDeviceEntity* this) {
     if (super->timer == 0) {
-        super->timer = 0x14;
+        super->timer = 20;
         SoundReq(SFX_MENU_ERROR);
     }
 }
diff --git a/src/object/gyorgBossObject.c b/src/object/gyorgBossObject.c
index 8a2ee8b4..251b3969 100644
--- a/src/object/gyorgBossObject.c
+++ b/src/object/gyorgBossObject.c
@@ -63,7 +63,7 @@ void GyorgBossObject_SetupStart(GyorgBossObjectEntity* this) {
         return;
     super->action = 1;
     super->myHeap = heap;
-    this->timer = 0x258;
+    this->timer = 600;
     this->unk_6c = 0;
     heap->boss = this;
     tmp = CreateEnemy(GYORG_FEMALE, 0);
@@ -120,7 +120,7 @@ void GyorgBossObject_FemalePhase1(GyorgBossObjectEntity* this) {
     if (((GyorgHeap*)super->myHeap)->female->base.health == 0) {
         // start male phase 1
         super->action = 3;
-        super->timer = 0x23;
+        super->timer = 35;
         this->unk_6c = 1;
         this->unk_78 = 0x400;
         this->unk_7b = 1;
@@ -156,7 +156,7 @@ void GyorgBossObject_FemalePhase2(GyorgBossObjectEntity* this) {
         // start male phase 2
         ((GyorgHeap*)super->myHeap)->male1->base.health = 12;
         super->action = 5;
-        super->timer = 0x23;
+        super->timer = 35;
         this->unk_6c = 2;
         this->unk_78 = 0x400;
         this->unk_7b = 1;
@@ -191,7 +191,7 @@ void GyorgBossObject_FemalePhase3(GyorgBossObjectEntity* this) {
         // start male phase 3
         ((GyorgHeap*)super->myHeap)->male2->base.health = 12;
         super->action = 7;
-        super->timer = 0x23;
+        super->timer = 35;
         this->unk_6c = 0x104;
         this->unk_78 = 0x400;
         SoundReq(SFX_BOSS_DIE);
@@ -228,8 +228,8 @@ void GyorgBossObject_FemalePhase4(GyorgBossObjectEntity* this) {
         if (PlayerCanBeMoved() && gPlayerEntity.z.HALF.HI == 0) {
             super->action = 9;
             super->timer = 0;
-            super->subtimer = 0xF0;
-            this->timer = 0x1a4;
+            super->subtimer = 240;
+            this->timer = 420;
             super->direction = 0;
             super->speed = 0x60;
             gPlayerState.flags &= ~PL_FLAGS20000;
diff --git a/src/object/keyStealingTakkuri.c b/src/object/keyStealingTakkuri.c
index 919e804f..a7c90a1f 100644
--- a/src/object/keyStealingTakkuri.c
+++ b/src/object/keyStealingTakkuri.c
@@ -276,7 +276,8 @@ void KeyStealingTakkuri_Type3_Init(KeyStealingTakkuriEntity* this) {
 
     super->action++;
     super->collisionLayer = 2;
-    super->timer = 10;    super->subtimer = 0;
+    super->timer = 10;
+    super->subtimer = 0;
     super->spriteRendering.b3 = 1;
     super->speed = 0;
     super->direction = gUnk_0812412D[super->type2];
@@ -329,7 +330,8 @@ void KeyStealingTakkuri_Type3_Action1(KeyStealingTakkuriEntity* this) {
             }
             break;
         default:
-            super->timer = 10;            break;
+            super->timer = 10;
+            break;
     }
     UpdateAnimationSingleFrame(super);
 }
diff --git a/src/object/lavaPlatform.c b/src/object/lavaPlatform.c
index be0e619f..acf55a65 100644
--- a/src/object/lavaPlatform.c
+++ b/src/object/lavaPlatform.c
@@ -140,7 +140,7 @@ void LavaPlatform_Type1Action2(LavaPlatformEntity* this) {
         if (LavaPlatform_IsPlayerOnPlatform(this)) {
             super->action = 3;
             super->flags &= ~ENT_COLLIDE;
-            super->timer = 0x14;
+            super->timer = 20;
             gPlayerState.field_0x3f = 0xfd;
         }
     }
diff --git a/src/object/lilypadSmall.c b/src/object/lilypadSmall.c
index 0a14f7f2..55ec8dff 100644
--- a/src/object/lilypadSmall.c
+++ b/src/object/lilypadSmall.c
@@ -10,7 +10,7 @@ void LilypadSmall(Entity* this) {
 
     if (this->action == 0) {
         this->action = 1;
-        this->timer = 0x5a;
+        this->timer = 90;
         rand = Random();
         this->subtimer = rand;
         this->frameIndex = (rand >> 0x10) & 3;
diff --git a/src/object/lockedDoor.c b/src/object/lockedDoor.c
index f1530d33..624f02ab 100644
--- a/src/object/lockedDoor.c
+++ b/src/object/lockedDoor.c
@@ -214,7 +214,7 @@ void sub_080835F8(Entity* this) {
     if (this->interactType == 0 && !CheckFlags(this->field_0x86.HWORD))
         return;
     this->action = 1;
-    this->timer = 0x14;
+    this->timer = 20;
     sub_08083658(this);
     SetFlag(this->field_0x86.HWORD);
     sub_080526F8(-1);
@@ -230,7 +230,7 @@ void sub_08083638(Entity* this) {
 void sub_08083658(Entity* this) {
     const struct_0811F680* tmp;
     this->action = 1;
-    this->timer = 0x14;
+    this->timer = 20;
     this->direction = this->field_0x7c.BYTES.byte2 << 3;
     tmp = &gUnk_0811F680[this->field_0x7c.BYTES.byte2];
     this->x.HALF.HI += tmp->x;
diff --git a/src/object/macroBook.c b/src/object/macroBook.c
index f981eca7..63e3fb2a 100644
--- a/src/object/macroBook.c
+++ b/src/object/macroBook.c
@@ -35,7 +35,7 @@ void MacroBook(Entity* this) {
 
 void MacroBook_Init(MacroBookEntity* this) {
     super->action = 1;
-    super->timer = 0x80;
+    super->timer = 128;
     super->subtimer = 0;
     super->spriteRendering.b0 = 3;
     this->unk80 = 0x80;
diff --git a/src/object/metalDoor.c b/src/object/metalDoor.c
index 1938f2b5..e0e3c0d4 100644
--- a/src/object/metalDoor.c
+++ b/src/object/metalDoor.c
@@ -43,7 +43,7 @@ void sub_080A0684(Entity* this) {
 void sub_080A0718(Entity* this) {
     if (sub_08083734(this, 2) != 0) {
         this->action = 2;
-        this->timer = 0xc;
+        this->timer = 12;
         this->spriteSettings.draw = TRUE;
         this->direction = 0;
         this->y.HALF.HI += 0x24;
@@ -79,7 +79,7 @@ void sub_080A074C(Entity* this) {
 void sub_080A07BC(Entity* this) {
     if (CheckFlags(this->field_0x86.HWORD)) {
         this->action = 4;
-        this->timer = 0xc;
+        this->timer = 12;
         this->direction = 0x10;
         this->y.HALF.HI += 2;
         sub_080A0870(this);
diff --git a/src/object/object12.c b/src/object/object12.c
index 5326337f..4784011f 100644
--- a/src/object/object12.c
+++ b/src/object/object12.c
@@ -41,7 +41,7 @@ void Object12_Init(Object12Entity* this) {
         sub_080850FC(this);
     } else {
         super->action = 2;
-        super->timer = 0xf0;
+        super->timer = 240;
         super->speed = 0x80;
         super->direction = 0x18;
     }
@@ -75,7 +75,7 @@ void Object12_Action2(Object12Entity* this) {
 void Object12_Action3(Object12Entity* this) {
     if (--super->timer == 0) {
         super->action = 4;
-        super->timer = 0x60;
+        super->timer = 96;
     }
 }
 
diff --git a/src/object/object2A.c b/src/object/object2A.c
index 4ace87be..226c9868 100644
--- a/src/object/object2A.c
+++ b/src/object/object2A.c
@@ -22,10 +22,10 @@ void Object2A_Init(Entity* this) {
     switch (this->type) {
         case 1:
             this->y.HALF.HI -= 8;
-            this->timer = 0x28;
+            this->timer = 40;
             break;
         case 2:
-            this->timer = 0xf;
+            this->timer = 15;
             sub_08004168(this);
             break;
         case 3:
diff --git a/src/object/object35.c b/src/object/object35.c
index 29ffef83..75f401f6 100644
--- a/src/object/object35.c
+++ b/src/object/object35.c
@@ -60,7 +60,7 @@ void Object35_Type0Init(Object35Entity* this) {
     super->collisionLayer = 2;
     UpdateSpriteForCollisionLayer(super);
     super->spritePriority.b0 = 1;
-    super->timer = -0x4c;
+    super->timer = -76;
     InitializeAnimation(super, super->type2);
 }
 
@@ -68,10 +68,10 @@ void Object35_Type0Action1(Object35Entity* this) {
     s8 tmp;
     GetNextFrame(super);
     if (--super->timer == 0) {
-        super->timer = -0x4c;
+        super->timer = -76;
         super->type2++;
         tmp = 3;
-        super->type2 = super->type2 % tmp;
+        super->type2 %= tmp;
         InitializeAnimation(super, super->type2);
     }
 }
diff --git a/src/object/object36.c b/src/object/object36.c
index 85762107..e7f23a70 100644
--- a/src/object/object36.c
+++ b/src/object/object36.c
@@ -87,7 +87,7 @@ void sub_0808BC3C(Object36Entity* this) {
         if (super->timer == 0) {
             SetGlobalFlag(LV1TARU_OPEN);
             super->action = 2;
-            super->subtimer = 0x80;
+            super->subtimer = 128;
             super->spriteOffsetY = 0;
         } else {
             if ((super->timer & 1) != 0) {
diff --git a/src/object/object3E.c b/src/object/object3E.c
index 6442831b..0ca77146 100644
--- a/src/object/object3E.c
+++ b/src/object/object3E.c
@@ -41,7 +41,7 @@ void Object3E_Type0(Object3EEntity* this) {
     switch (super->action) {
         case 0:
             super->action = 1;
-            super->timer = 0x40 - (Random() & 0x1f);
+            super->timer = 64 - (Random() & 0x1F);
             super->frameIndex = 0;
             super->animationState = 0;
             super->spriteRendering.b3 = 3;
@@ -61,7 +61,7 @@ void Object3E_Type0(Object3EEntity* this) {
                 if (--super->subtimer == 0) {
                     super->frameIndex = 0;
                     super->action = 1;
-                    super->timer = 0x40 - (Random() & 0x1f);
+                    super->timer = 64 - (Random() & 0x1F);
                 } else {
                     super->timer = 8;
                     tmp2 = super->animationState;
diff --git a/src/object/object43.c b/src/object/object43.c
index 6a419c3a..f284d2a8 100644
--- a/src/object/object43.c
+++ b/src/object/object43.c
@@ -48,13 +48,13 @@ void Object43_Init(Object43Entity* this) {
     super->updatePriority = 6;
     InitializeAnimation(super, 7);
     if (super->type2 != 0) {
-        super->timer = 0x28;
+        super->timer = 40;
     } else {
         super->spriteSettings.draw = 1;
-        if ((gPlayerState.skills & SKILL_FAST_SPIN) != 0) {
-            super->timer = 0x28;
+        if (gPlayerState.skills & SKILL_FAST_SPIN) {
+            super->timer = 40;
         } else {
-            super->timer = 0x50;
+            super->timer = 80;
         }
 
         Object43_Action1(this);
diff --git a/src/object/object8E.c b/src/object/object8E.c
index 06d0df7a..717e88fa 100644
--- a/src/object/object8E.c
+++ b/src/object/object8E.c
@@ -292,7 +292,7 @@ void Object8E_Type4(Object8EEntity* this) {
         case 0:
             super->action = 1;
             super->timer = 60;
-            super->subtimer = 0x80;
+            super->subtimer = 128;
             gRoomControls.camera_target = super;
             gRoomControls.unk5 = 1;
             if (super->x.HALF.HI > gPlayerEntity.x.HALF.HI) {
diff --git a/src/object/objectA8.c b/src/object/objectA8.c
index 1dbc7af2..3830a672 100644
--- a/src/object/objectA8.c
+++ b/src/object/objectA8.c
@@ -93,7 +93,7 @@ void ObjectA8_Action1(ObjectA8Entity* this) {
         if (super->timer != 0) {
             super->timer *= 0x1e;
         } else {
-            super->timer = 0xf0;
+            super->timer = 240;
         }
         super->action = 3;
         super->subtimer = 1;
@@ -184,7 +184,7 @@ void ObjectA8_Action4(ObjectA8Entity* this) {
 
 void ObjectA8_Action5(ObjectA8Entity* this) {
     super->action = 6;
-    super->timer = 0x80;
+    super->timer = 128;
     super->subtimer = 6;
     super->flags &= ~ENT_COLLIDE;
     super->spriteSettings.draw = 1;
diff --git a/src/object/objectB4.c b/src/object/objectB4.c
index 4e3cd462..32c9255a 100644
--- a/src/object/objectB4.c
+++ b/src/object/objectB4.c
@@ -112,7 +112,7 @@ void ObjectB4_Type2(Entity* this) {
         this->spritePriority.b0 = 0;
         this->spriteOrientation.flipY = 1;
         this->frameIndex = 11;
-        this->timer = (Random() & 0x3f) + 0x40;
+        this->timer = (Random() & 0x3f) + 64;
         this->subtimer = 0;
     }
 
@@ -120,7 +120,7 @@ void ObjectB4_Type2(Entity* this) {
         this->timer = 4;
         this->frameIndex = gUnk_08124B30[this->subtimer++] + 2;
         if (gUnk_08124B30[this->subtimer] == 0xff) {
-            this->timer = (Random() & 0x3f) + 0x40;
+            this->timer = (Random() & 0x3f) + 64;
             this->subtimer = 0;
         }
     }
diff --git a/src/object/objectE.c b/src/object/objectE.c
index c5b05304..3f8319b8 100644
--- a/src/object/objectE.c
+++ b/src/object/objectE.c
@@ -13,7 +13,7 @@
 void ObjectE(Entity* this) {
     if (this->action == 0) {
         this->action = 1;
-        this->timer = 0x14;
+        this->timer = 20;
         sub_08004168(this);
     } else {
         if (this->timer-- == 0) {
diff --git a/src/object/octorokBossObject.c b/src/object/octorokBossObject.c
index de5aa680..fc90f935 100644
--- a/src/object/octorokBossObject.c
+++ b/src/object/octorokBossObject.c
@@ -177,7 +177,7 @@ NONMATCH("asm/non_matching/octorokBossObject/OctorokBossObject_Action1.inc",
             }
             if ((u32)this->timer == GET_HELPER(this)->tailCount - 1) {
                 this->action = 2;
-                this->timer = 0xf0;
+                this->timer = 240;
                 this->direction = gUnk_0812384C[(this->type2 & 0xf) * 2] + ((u8)Random() & 0xf);
                 this->speed = gUnk_0812384C[(this->type2 & 0xf) * 2 + 1] + ((u16)Random() & 0x1ff);
                 if (this->type != 0) {
diff --git a/src/object/picoBloom.c b/src/object/picoBloom.c
index 37b6a751..184fac91 100644
--- a/src/object/picoBloom.c
+++ b/src/object/picoBloom.c
@@ -26,7 +26,7 @@ void PicoBloom_Init(Entity* this) {
         nextAction = 2;
     }
     this->action = nextAction;
-    this->timer = (Random() & 0x7f) + 0x7f;
+    this->timer = (Random() & 0x7f) + 127;
     this->collisionLayer = 1;
     UpdateSpriteForCollisionLayer(this);
     InitializeAnimation(this, typeAnimationStates[this->type] + this->type2);
diff --git a/src/object/pushableFurniture.c b/src/object/pushableFurniture.c
index 5bc5e21d..3685a0e4 100644
--- a/src/object/pushableFurniture.c
+++ b/src/object/pushableFurniture.c
@@ -79,7 +79,7 @@ void PushableFurniture_Action1(PushableFurnitureEntity* this) {
                 case 0:
                     if (sub_0808FECC(this)) {
                         super->subAction = 1;
-                        super->timer = 0xc;
+                        super->timer = 12;
                     }
                     break;
                 case 1:
@@ -189,10 +189,10 @@ bool32 sub_0808FC5C(PushableFurnitureEntity* this) {
         if (this->unk_80 == 0) {
             super->timer = 4;
         } else {
-            super->timer = 0x18;
+            super->timer = 24;
         }
         if ((gPlayerState.flags & PL_MINISH) == 0) {
-            super->timer += 0x10;
+            super->timer += 16;
         }
         sub_0808FF50(this);
         return TRUE;
diff --git a/src/object/pushableGrave.c b/src/object/pushableGrave.c
index 49081cd4..a26f8d13 100644
--- a/src/object/pushableGrave.c
+++ b/src/object/pushableGrave.c
@@ -101,8 +101,8 @@ void PushableGrave_Action2(PushableGraveEntity* this) {
     } else {
         if (--super->subtimer == 0) {
             super->action = 3;
-            super->timer = 0x60;
-            super->subtimer = 0x14;
+            super->timer = 96;
+            super->subtimer = 20;
             RequestPriorityDuration(super, 0x60);
             SoundReq(SFX_10F);
         }
@@ -177,7 +177,7 @@ bool32 sub_0809785C(PushableGraveEntity* this) {
         if (CheckFlags(this->pushedFlag) != 0) {
             super->action = 2;
             super->subAction = 0;
-            super->timer = 0xf0;
+            super->timer = 240;
             super->subtimer = 60;
             super->direction = 0;
             super->speed = 0x40;
diff --git a/src/object/smoke.c b/src/object/smoke.c
index 8f76ea10..64d7d974 100644
--- a/src/object/smoke.c
+++ b/src/object/smoke.c
@@ -21,10 +21,10 @@ void sub_0808A40C(Entity* this) {
 
     if (this->action == 0) {
         this->action = 1;
-        this->timer = 0x28;
+        this->timer = 40;
     }
     if (--this->timer == 0) {
-        this->timer = 0x40 - (Random() & 0x1f);
+        this->timer = 64 - (Random() & 0x1F);
         ent = CreateObject(SMOKE, 1, 0);
         if (ent != NULL) {
             CopyPosition(this, ent);
diff --git a/src/object/treeHidingPortal.c b/src/object/treeHidingPortal.c
index f8500920..8778f3c8 100644
--- a/src/object/treeHidingPortal.c
+++ b/src/object/treeHidingPortal.c
@@ -50,7 +50,7 @@ void sub_0809E86C(Entity* this) {
     }
     if (sub_0809E9A0() == 0x54) {
         this->action = 2;
-        this->timer = 0xf;
+        this->timer = 15;
         SetPlayerControl(1);
     }
 }
diff --git a/src/object/warpPoint.c b/src/object/warpPoint.c
index c558ce37..f104b281 100644
--- a/src/object/warpPoint.c
+++ b/src/object/warpPoint.c
@@ -51,7 +51,7 @@ void sub_0808B474(Entity* this) {
     if (!sub_0808B7C8(this))
         return;
     this->action = 4;
-    this->subtimer = 0x60;
+    this->subtimer = 96;
     gPlayerEntity.x.HALF.HI = this->x.HALF.HI;
     gPlayerEntity.y.HALF.HI = this->y.HALF.HI;
     gPlayerEntity.animationState = 4;
@@ -85,7 +85,7 @@ void sub_0808B590(Entity* this) {
         if (this->timer)
             return;
         this->action = 5;
-        this->subtimer = 0x60;
+        this->subtimer = 96;
         PutAwayItems();
         gPlayerEntity.x.HALF.HI = this->x.HALF.HI;
         gPlayerEntity.y.HALF.HI = this->y.HALF.HI;