From 69568e03b0e717ec0e451cf753ebfde88c48e010 Mon Sep 17 00:00:00 2001 From: Elliptic Ellipsis Date: Wed, 22 Jun 2022 00:00:57 +0100 Subject: [PATCH] Should be the rest of them --- src/enemy/cloudPiranha.c | 4 ++-- src/enemy/gleerok.c | 4 ++-- src/enemy/gyorgMale.c | 2 +- src/enemy/helmasaur.c | 2 +- src/enemy/keese.c | 2 +- src/enemy/likeLike.c | 2 +- src/enemy/madderpillar.c | 2 +- src/enemy/miniSlime.c | 2 +- src/enemy/mulldozer.c | 2 +- src/enemy/octorokBoss.c | 4 ++-- src/enemy/rope.c | 2 +- src/enemy/smallPesto.c | 2 +- src/enemy/spearMoblin.c | 6 +++--- src/enemy/spinyBeetle.c | 4 ++-- src/enemy/stalfos.c | 13 ++++++------ src/enemy/takkuri.c | 6 +++--- src/enemy/tektite.c | 6 +++--- src/enemy/tektiteGolden.c | 10 ++++----- src/enemy/vaatiArm.c | 8 ++++---- src/enemy/vaatiProjectile.c | 4 ++-- src/enemy/vaatiRebornEnemy.c | 14 ++++++------- src/enemy/vaatiTransfigured.c | 28 +++++++++++++------------- src/enemy/vaatiWrath.c | 4 ++-- src/enemy/wallMaster.c | 2 +- src/enemy/wisp.c | 2 +- src/enemy/wizzrobeFire.c | 18 ++++++++--------- src/enemy/wizzrobeIce.c | 14 ++++++------- src/enemy/wizzrobeWind.c | 18 ++++++++--------- src/manager/bombableWallManager.c | 2 +- src/manager/bridgeManager.c | 2 +- src/manager/hyruleTownBellManager.c | 2 +- src/manager/lightManager.c | 2 +- src/manager/rainfallManager.c | 2 +- src/manager/tileChangeObserveManager.c | 2 +- src/manager/vaatiAppearingManager.c | 2 +- src/menu/kinstone_menu.c | 4 ++-- src/npc/bigGoron.c | 2 +- src/npc/cat.c | 4 ++-- src/npc/cow.c | 2 +- src/npc/cucco.c | 2 +- src/npc/cuccoChick.c | 2 +- src/npc/dog.c | 6 +++--- src/npc/kid.c | 4 ++-- src/npc/npc5.c | 6 +++--- src/npc/postman.c | 2 +- src/npc/rem.c | 4 ++-- src/npc/vaatiReborn.c | 2 +- src/object/beanstalk.c | 2 +- src/object/bird.c | 2 +- src/object/bossDoor.c | 4 ++-- src/object/button.c | 7 ++++--- src/object/crenelBeanSprout.c | 12 +++++------ src/object/ezloCap.c | 6 ++++-- src/object/fairy.c | 2 +- src/object/figurineDevice.c | 4 ++-- src/object/gyorgBossObject.c | 12 +++++------ src/object/keyStealingTakkuri.c | 6 ++++-- src/object/lavaPlatform.c | 2 +- src/object/lilypadSmall.c | 2 +- src/object/lockedDoor.c | 4 ++-- src/object/macroBook.c | 2 +- src/object/metalDoor.c | 4 ++-- src/object/object12.c | 4 ++-- src/object/object2A.c | 4 ++-- src/object/object35.c | 6 +++--- src/object/object36.c | 2 +- src/object/object3E.c | 4 ++-- src/object/object43.c | 8 ++++---- src/object/object8E.c | 2 +- src/object/objectA8.c | 4 ++-- src/object/objectB4.c | 4 ++-- src/object/objectE.c | 2 +- src/object/octorokBossObject.c | 2 +- src/object/picoBloom.c | 2 +- src/object/pushableFurniture.c | 6 +++--- src/object/pushableGrave.c | 6 +++--- src/object/smoke.c | 4 ++-- src/object/treeHidingPortal.c | 2 +- src/object/warpPoint.c | 4 ++-- src/playerItem/playerItemBomb.c | 6 +++--- src/playerItem/playerItemBottle.c | 8 ++++---- src/playerItem/playerItemGustBig.c | 2 +- src/playerItem/playerItemGustJar.c | 2 +- src/playerItem/playerItemLantern.c | 4 ++-- src/playerItem/playerItemSwordBeam.c | 2 +- src/playerUtils.c | 2 +- src/projectile/arrowProjectile.c | 2 +- src/projectile/gleerokProjectile.c | 2 +- src/projectile/guardLineOfSight.c | 2 +- src/projectile/gyorgTail.c | 2 +- src/projectile/v1FireProjectile.c | 2 +- src/projectile/v2Projectile.c | 4 ++-- src/projectile/v3ElectricProjectile.c | 2 +- src/subtask.c | 2 +- 94 files changed, 213 insertions(+), 209 deletions(-) diff --git a/src/enemy/cloudPiranha.c b/src/enemy/cloudPiranha.c index 267cc52a..d9ae589f 100644 --- a/src/enemy/cloudPiranha.c +++ b/src/enemy/cloudPiranha.c @@ -133,7 +133,7 @@ void sub_080385CC(CloudPiranhaEntity* this) { sub_080387F0(this); if (sub_0803872C(this, 0x60)) { super->action = 3; - super->subtimer = 0xc; + super->subtimer = 12; super->speed = 0x80; super->animationState = sub_0806FCAC(super, super->child); super->direction = super->animationState << 2; @@ -182,7 +182,7 @@ void CloudPiranha_Action4(CloudPiranhaEntity* this) { super->action = 1; super->hitType = 0x72; super->timer = 1; - super->subtimer = 0x80; + super->subtimer = 128; super->speed = 0x80; super->spritePriority.b1 = 2; EnqueueSFX(SFX_124); diff --git a/src/enemy/gleerok.c b/src/enemy/gleerok.c index 3b859b52..1b8cdc30 100644 --- a/src/enemy/gleerok.c +++ b/src/enemy/gleerok.c @@ -148,7 +148,7 @@ void sub_0802D170(GleerokEntity* this) { } else { super->action = 3; this->unk_80 = 0; - ((Entity*)this->unk_84)->parent->timer = 0x18; + ((Entity*)this->unk_84)->parent->timer = 24; this->unk_84->filler[0x19] = 0; } } @@ -161,7 +161,7 @@ void sub_0802D218(GleerokEntity* this) { super->timer = 0; super->subtimer = 0; this->unk_7c.HALF_U.LO = 0xb4; - ((Entity*)(this->unk_84))->parent->timer = 0xc; + ((Entity*)(this->unk_84))->parent->timer = 12; CreateObjectWithParent(super, 0x67, 0x2, this->unk_7c.HALF_U.LO); } diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c index 69ce13e4..731404a8 100644 --- a/src/enemy/gyorgMale.c +++ b/src/enemy/gyorgMale.c @@ -410,7 +410,7 @@ void sub_08046EF4(GyorgMaleEntity* this) { super->speed = gUnk_080D1B74[(super->timer >> 3) & 0xF]; if (--super->subtimer == 0) { Entity* tmp; - super->subtimer = (Random() & 0x38) + 0x78; + super->subtimer = (Random() & 0x38) + 120; tmp = CreateProjectile(GYORG_MALE_ENERGY_PROJECTILE); if (tmp) { tmp->collisionLayer = 2; diff --git a/src/enemy/helmasaur.c b/src/enemy/helmasaur.c index 9e5c57c8..0e689c45 100644 --- a/src/enemy/helmasaur.c +++ b/src/enemy/helmasaur.c @@ -170,7 +170,7 @@ void sub_0802BDE0(Entity* this) { this->field_0x78.HALF.HI = 0xff; } else { this->action = 1; - this->timer = (Random() & 0xf) + 0xf; + this->timer = (Random() & 0xf) + 15; this->field_0x78.HALF.HI = this->direction; } } diff --git a/src/enemy/keese.c b/src/enemy/keese.c index 8e42c76e..0a6b0d1f 100644 --- a/src/enemy/keese.c +++ b/src/enemy/keese.c @@ -152,7 +152,7 @@ void Keese_StartFly(KeeseEntity* this) { }; super->action = KEESE_ACTION_FLY; - this->flyTimer = gKeeseFlyDurations[Random() & 0xf]; + this->flyTimer = gKeeseFlyDurations[Random() & 0xF]; this->sleepTimer = 60; InitializeAnimation(super, KeeseAnimation_Fly); } diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c index 5946c606..9fb8e750 100644 --- a/src/enemy/likeLike.c +++ b/src/enemy/likeLike.c @@ -231,7 +231,7 @@ NONMATCH("asm/non_matching/likeLike/sub_0802810C.inc", void sub_0802810C(Entity* END_NONMATCH void sub_080281A0(Entity* this) { - this->subtimer = 0x19; + this->subtimer = 25; if (sub_080281E0(ITEM_MIRROR_SHIELD)) { this->field_0x80.HALF.LO = ITEM_MIRROR_SHIELD; MessageFromTarget(TEXT_INDEX(TEXT_ITEM_GET, 0x78)); diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c index c10c9a1b..46f0d2ef 100644 --- a/src/enemy/madderpillar.c +++ b/src/enemy/madderpillar.c @@ -471,7 +471,7 @@ void sub_0802A0F8(Entity* this) { } else { this->parent->flags &= ~ENT_COLLIDE; this->parent->health = 0; - this->parent->subtimer = 0x69; + this->parent->subtimer = 105; } } diff --git a/src/enemy/miniSlime.c b/src/enemy/miniSlime.c index 490f4eed..6352e5ee 100644 --- a/src/enemy/miniSlime.c +++ b/src/enemy/miniSlime.c @@ -88,7 +88,7 @@ void sub_080452FC(Entity* this) { this->action = 3; this->timer = 1; if (0 < this->speed) - this->timer = FixedDiv(0x1000, this->speed) >> 0x8; + this->timer = FixedDiv(0x1000, this->speed) >> 8; if (sub_08049FA0(this) == 0 && (Random() & 3)) { cVar2 = sub_08049EE4(this); diff --git a/src/enemy/mulldozer.c b/src/enemy/mulldozer.c index 69ec5ed2..17c9a495 100644 --- a/src/enemy/mulldozer.c +++ b/src/enemy/mulldozer.c @@ -270,7 +270,7 @@ void sub_080330C0(MulldozerEntity* this) { super->action = 2; this->unk_80 = 0; if (super->type == 0) { - super->timer = (Random() & 0x38) + 0x18; + super->timer = (Random() & 0x38) + 24; } else { super->timer = 6; } diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c index b743634f..62be3d1a 100644 --- a/src/enemy/octorokBoss.c +++ b/src/enemy/octorokBoss.c @@ -652,7 +652,7 @@ void OctorokBoss_Action1_ChargeAttack(OctorokBossEntity* this) { super->knockbackDuration = 0x20; super->knockbackSpeed = 0x200; super->knockbackDirection = super->direction ^ 0x10; - this->heap->fallingStonesTimer += 0x3c; + this->heap->fallingStonesTimer += 60; OctorokBoss_SetAttackTimer(this); InitScreenShake(60, 0); SoundReq(SFX_158); @@ -936,7 +936,7 @@ void OctorokBoss_Burning_SubAction1(OctorokBossEntity* this) { super->knockbackDuration = 0x18; super->knockbackSpeed = 0x200; super->knockbackDirection = super->direction ^ 0x10; - this->heap->fallingStonesTimer += 0x1e; + this->heap->fallingStonesTimer += 30; InitScreenShake(30, 0); SoundReq(SFX_158); SoundReq(SFX_14C); diff --git a/src/enemy/rope.c b/src/enemy/rope.c index f8a66318..098d4b89 100644 --- a/src/enemy/rope.c +++ b/src/enemy/rope.c @@ -114,7 +114,7 @@ void sub_08031480(Entity* this) { } else { if (GravityUpdate(this, Q_8_8(24.0)) == 0) { this->action = 2; - this->subtimer = 0xf; + this->subtimer = 15; this->spriteSettings.draw = 1; UpdateSpriteForCollisionLayer(this); EnqueueSFX(SFX_WATER_SPLASH); diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c index 5c4ca544..490da140 100644 --- a/src/enemy/smallPesto.c +++ b/src/enemy/smallPesto.c @@ -87,7 +87,7 @@ void sub_08031704(Entity* this) { void sub_08031714(Entity* this) { sub_080317B4(this); if (--this->subtimer == 0) { - this->subtimer = (Random() & 0xf) + 0x10; + this->subtimer = (Random() & 0xf) + 16; if (sub_08049FA0(this) == 0 && (this->subtimer & 1) != 0) { this->direction = sub_08049EE4(this); } else { diff --git a/src/enemy/spearMoblin.c b/src/enemy/spearMoblin.c index 819f4e79..a44ef967 100644 --- a/src/enemy/spearMoblin.c +++ b/src/enemy/spearMoblin.c @@ -173,7 +173,7 @@ void sub_08028488(Entity* this) { case 2: this->action = 2; this->speed = 0; - this->timer = (Random() & 7) * 3 + 0x40; + this->timer = (Random() & 7) * 3 + 64; break; case 4: this->direction = (this->direction + 0x10) & 0x18; @@ -256,13 +256,13 @@ NONMATCH("asm/non_matching/spearMoblin/sub_08028604.inc", void sub_08028604(Enti uVar1 = gUnk_080CC7C0[Random() & 0xf]; } else { uVar1 = gUnk_080CC7C0[Random() & 7]; - this->timer = this->timer + 0x10; + this->timer = this->timer + 16; this->field_0x82.HALF.HI--; } this->direction = iVar3 + uVar1 + (4U & 0x18); } } else { - this->timer = 0xc; + this->timer = 12; this->speed = 0; } diff --git a/src/enemy/spinyBeetle.c b/src/enemy/spinyBeetle.c index 75c11751..54de6f62 100644 --- a/src/enemy/spinyBeetle.c +++ b/src/enemy/spinyBeetle.c @@ -51,7 +51,7 @@ void SpinyBeetle_OnCollision(SpinyBeetleEntity* this) { if ((super->contactFlags & 0x3f) == 0x14 && super->action != 5) { super->action = 3; - super->timer = 0x5a; + super->timer = 90; super->subtimer = 16; super->spritePriority.b1 = 1; super->direction = DirectionRoundUp(sub_08049F84(super, 1)); @@ -294,7 +294,7 @@ void sub_08033C94(SpinyBeetleEntity* this) { if (--super->timer) return; - super->timer = (Random() & 0x1f) + 0x20; + super->timer = (Random() & 0x1f) + 32; super->direction = sub_08049F84(super, 1) + 0x14; switch (Random() & 3) { case 1: diff --git a/src/enemy/stalfos.c b/src/enemy/stalfos.c index ec52cce9..eb87e265 100644 --- a/src/enemy/stalfos.c +++ b/src/enemy/stalfos.c @@ -176,7 +176,8 @@ 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 = 10; sub_08039858(this); + super->timer = 10; + sub_08039858(this); } } @@ -214,20 +215,20 @@ void Stalfos_Action5(StalfosEntity* this) { GravityUpdate(super, Q_8_8(24.0)); if (super->zVelocity < 0) { super->action = 6; - super->timer = 0x0f; + super->timer = 15; } } void Stalfos_Action6(StalfosEntity* this) { - u16 tmp; - if (super->timer != 0) { super->timer--; } else { - tmp = super->z.HALF.HI += 4; + u16 tmp = super->z.HALF.HI += 4; + if (-1 < (tmp * 0x10000)) { super->action = 7; - super->timer = 10; super->z.HALF.HI = 0; + super->timer = 10; + super->z.HALF.HI = 0; this->unk_7a = 0x78; this->unk_7c = 0x3c; sub_080399C4(this); diff --git a/src/enemy/takkuri.c b/src/enemy/takkuri.c index 1d55d496..28a75426 100644 --- a/src/enemy/takkuri.c +++ b/src/enemy/takkuri.c @@ -183,7 +183,7 @@ void sub_0803BDD8(TakkuriEntity* this) { COLLISION_ON(super); super->action = 2; this->unk_0x84 = 1; - super->timer = 0x18; + super->timer = 24; this->unk_0x82 = 0x12c; super->speed = 0x12c + 0x94; this->unk_0x81 = 4; @@ -199,7 +199,7 @@ void sub_0803BE7C(TakkuriEntity* this) { super->action = 1; super->spriteSettings.draw = 1; COLLISION_OFF(super); - super->timer = 0x8; + super->timer = 8; super->subtimer = 1; super->direction = sub_08049F84(super, 1); this->unk_0x80 = 0; @@ -246,7 +246,7 @@ void sub_0803BF70(TakkuriEntity* this) { } if (--super->timer == 0) { this->unk_0x84 = 1; - super->timer = 0x18; + super->timer = 24; COLLISION_ON(super); this->unk_0x81 = 2; sub_0803BF2C(this); diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c index fe0d3667..04b9769c 100644 --- a/src/enemy/tektite.c +++ b/src/enemy/tektite.c @@ -59,7 +59,7 @@ void Tektite_OnCollision(Entity* this) { this->action = 1; this->subAction = 0; if (this->type != 0) { - this->timer = 0xc0; + this->timer = 192; } else { this->timer = gUnk_080CDEF8[Random() & 3]; } @@ -98,7 +98,7 @@ void sub_0802F210(Entity* this) { this->action = 1; this->subAction = 0; this->timer = gUnk_080CDEF8[Random() & 3]; - this->timer = (Random() & 0x1f) + this->timer; + this->timer += (Random() & 0x1f); this->subtimer = 0; *(u8*)&this->field_0x7c = 0; @@ -149,7 +149,7 @@ void sub_0802F300(Entity* this) { } if (rand == 0) { - this->timer = 0xc0; + this->timer = 192; } else { this->timer = gUnk_080CDEF8[rand & 3] + rand; } diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c index 06c5aec5..beaffd3f 100644 --- a/src/enemy/tektiteGolden.c +++ b/src/enemy/tektiteGolden.c @@ -50,7 +50,7 @@ void TektiteGolden_OnCollision(Entity* this) { if (this->contactFlags == 0x94) { this->action = 1; this->subAction = 0; - this->timer = 0x14; + this->timer = 20; this->subtimer = 0; this->field_0x80.HALF.LO = 0; if (this->z.HALF.HI != 0) { @@ -92,7 +92,7 @@ void sub_08037FA0(Entity* this) { sub_0804A720(this); this->action = 1; this->subAction = 0; - this->timer = (Random() & 0x1f) + 0x20; + this->timer = (Random() & 0x1f) + 32; this->subtimer = 0; this->field_0x80.HALF.LO = 0; InitializeAnimation(this, 0); @@ -129,7 +129,7 @@ void sub_08038048(Entity* this) { if (sub_080044EC(this, 0x3000) == 1) { this->action = 3; this->subAction = 0; - this->timer = 0x14; + this->timer = 20; InitializeAnimation(this, 3); return; } else if (this->collisions != COL_NONE) { @@ -139,7 +139,7 @@ void sub_08038048(Entity* this) { } if (--this->timer == 0) { - this->timer = rand + 0x10; + this->timer = rand + 16; sub_08038168(this); } @@ -169,7 +169,7 @@ void sub_08038110(Entity* this) { } else { this->action = 1; this->field_0x80.HALF.LO = 0; - this->timer = 0xc0; + this->timer = 192; InitializeAnimation(this, 0); } } diff --git a/src/enemy/vaatiArm.c b/src/enemy/vaatiArm.c index c1546fca..264cf441 100644 --- a/src/enemy/vaatiArm.c +++ b/src/enemy/vaatiArm.c @@ -269,7 +269,7 @@ static void sub_08042654(Entity* this) { if ((((VaatiArm_HeapStruct*)this->myHeap)->s1[4].unk0c += 2) < 0x1c) break; this->subAction = 5; - this->timer = 0x5a; + this->timer = 90; ((VaatiArm_HeapStruct*)this->myHeap)->entities[0]->flags |= ENT_COLLIDE; ((VaatiArm_HeapStruct*)this->myHeap)->entities[0]->spritePriority.b0 = 4; ((VaatiArm_HeapStruct*)this->myHeap)->entities[1]->flags |= ENT_COLLIDE; @@ -640,7 +640,7 @@ static void sub_08042E30(Entity* this) { pVVar9 = &((VaatiArm_HeapStruct*)this->myHeap)->s1[0]; if (--this->timer == 0) { this->subAction = 4; - this->timer = (Random() & 0x38) + 0x28; + this->timer = (Random() & 0x38) + 40; this->speed = 0x200; this->direction = pVVar9->unk00.HALF.HI >> 3; uVar6 = CalculateDirectionTo(this->x.HALF.HI, this->y.HALF.HI, gRoomControls.origin_x + 0x110, @@ -674,7 +674,7 @@ static void sub_08042EF4(Entity* this) { if (--this->timer == 0) { if (EntityWithinDistance(this, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI, 0x50)) { this->subAction = 6; - this->timer = 0x28; + this->timer = 40; } else { this->subAction = 5; InitAnimationForceUpdate(this, 0xf); @@ -1059,7 +1059,7 @@ static void sub_08043698(Entity* this) { static inline void deleteThing(Entity* this, const u32 index) { if (--this->timer == 0) { - this->timer = 0x14; + this->timer = 20; this->subAction = index + 1; if (index == 1) { this->spriteSettings.draw = 0; diff --git a/src/enemy/vaatiProjectile.c b/src/enemy/vaatiProjectile.c index 252b7fb2..893b0cb8 100644 --- a/src/enemy/vaatiProjectile.c +++ b/src/enemy/vaatiProjectile.c @@ -156,7 +156,7 @@ void VaatiProjectileFunction0Action3(Entity* this) { if (this->child->frame & ANIM_DONE) { if (--this->z.HALF.HI <= -0x18) { this->action = 4; - this->timer = (Random() & 0xf) + 0xf; + this->timer = (Random() & 0xf) + 15; InitializeAnimation(this->child, 1); } GetNextFrame(this); @@ -180,7 +180,7 @@ void VaatiProjectileFunction0Action5(Entity* this) { return; } this->action = 6; - this->timer = 0x14; + this->timer = 20; } } diff --git a/src/enemy/vaatiRebornEnemy.c b/src/enemy/vaatiRebornEnemy.c index fb38afb6..b6a257eb 100644 --- a/src/enemy/vaatiRebornEnemy.c +++ b/src/enemy/vaatiRebornEnemy.c @@ -164,7 +164,7 @@ void VaatiRebornEnemyType0Action1(Entity* this) { this->action = 3; this->field_0x74.HALF.HI = this->field_0x74.HALF.LO & 0x80; this->field_0x74.HALF.LO = 0; - this->timer = 0xc0; + this->timer = 192; this->direction = 0xff; this->spriteSettings.draw = 1; InitAnimationForceUpdate(this, 0); @@ -175,7 +175,7 @@ void VaatiRebornEnemyType0Action1(Entity* this) { switch (sub_0803DEE0(this)) { case 0: this->action = 4; - this->timer = 0xa0; + this->timer = 160; this->direction = 0xff; this->cutsceneBeh.HALF.LO = 0xff; InitAnimationForceUpdate(this, 1); @@ -384,7 +384,7 @@ void VaatiRebornEnemyType0Action5(Entity* this) { case 1: if ((this->frame & 0x10) != 0) { this->field_0x74.HALF.LO = 2; - this->subtimer = (Random() & 0x3f) + 0x40; + this->subtimer = (Random() & 0x3f) + 64; SoundReq(SFX_SUMMON); } break; @@ -392,7 +392,7 @@ void VaatiRebornEnemyType0Action5(Entity* this) { if (--this->subtimer == 0) { if (!((this->field_0x86.HALF.LO < 2) || (3 < this->field_0x86.HALF.HI)) && (Random() & 0x10) != 0) { this->field_0x86.HALF.HI++; - this->subtimer = (Random() & 0x3f) + 0x40; + this->subtimer = (Random() & 0x3f) + 64; uVar3 = GetFacingDirection(this, &gPlayerEntity); this->direction = (uVar3 & 0x10) | 8; } else { @@ -432,7 +432,7 @@ void VaatiRebornEnemyType0Action6(Entity* this) { case 0: if (this->timer != 0) { this->field_0x74.HALF.LO = 1; - this->timer = 0x70; + this->timer = 112; } break; case 1: @@ -654,7 +654,7 @@ void VaatiRebornEnemyType1PreAction(Entity* this) { COLLISION_OFF(this); parent->action = 7; parent->flags &= ~ENT_COLLIDE; - parent->timer = 0x80; + parent->timer = 128; parent->spriteOffsetX = 0; parent->direction = -1; this->timer = 0; @@ -669,7 +669,7 @@ void VaatiRebornEnemyType1PreAction(Entity* this) { SoundReq(SFX_BOSS_HIT); InitScreenShake(12, 1); if (this->timer == 0) - this->timer = 0x48; + this->timer = 72; } } if (this->timer != 0) { diff --git a/src/enemy/vaatiTransfigured.c b/src/enemy/vaatiTransfigured.c index d1dd3abb..23c820bf 100644 --- a/src/enemy/vaatiTransfigured.c +++ b/src/enemy/vaatiTransfigured.c @@ -188,7 +188,7 @@ void VaatiTransfiguredType0Action1(Entity* this) { if (--this->timer == 0) { this->field_0x80.HALF.LO += 1; this->speed = 0x180; - this->timer = 0x14; + this->timer = 20; } break; case 1: @@ -203,7 +203,7 @@ void VaatiTransfiguredType0Action1(Entity* this) { this->field_0x80.HALF.LO += 1; this->speed = 0; if (this->animationState < 2) { - this->timer = (Random() & 0x7f) + 0x40; + this->timer = (Random() & 0x7f) + 64; } else { this->timer = 8; } @@ -269,7 +269,7 @@ void VaatiTransfiguredType0Action3(Entity* this) { if (uVar4 != 1) break; this->field_0x80.HALF.LO = 1; - this->timer = 0xc0; + this->timer = 192; COLLISION_ON(this); SoundReq(SFX_14C); InitScreenShake(20, 4); @@ -293,7 +293,7 @@ void VaatiTransfiguredType0Action3(Entity* this) { this->animationState++; if (this->animationState > 2) { this->action = 7; - this->timer = 0xe0; + this->timer = 224; DeleteClones(); SoundReq(SFX_BOSS_HIT); return; @@ -307,7 +307,7 @@ void VaatiTransfiguredType0Action3(Entity* this) { this->timer = 64; } else { this->field_0x80.HALF.LO = 4; - this->timer = 0x50; + this->timer = 80; } break; case 3: @@ -378,7 +378,7 @@ void VaatiTransfiguredType0Action4(Entity* this) { if (--this->timer == 0) { this->field_0x80.HALF.LO += 1; this->field_0x74.HALF.LO = 0; - this->timer = 0x80; + this->timer = 128; this->subtimer = 0; this->zVelocity = Q_16_16(2.25); SoundReq(SFX_12B); @@ -416,7 +416,7 @@ void VaatiTransfiguredType0Action4(Entity* this) { CreateProjectileWithParent(this, V2_PROJECTILE, this->subtimer); } if (((this->subtimer != 0) && (1 < this->animationState)) && (this->timer < 6)) { - this->timer = 0x80; + this->timer = 128; this->subtimer = 0; } } @@ -447,7 +447,7 @@ void VaatiTransfiguredType0Action5(Entity* this) { this->field_0x80.HALF.LO += 1; this->timer = 64; if (1 < this->animationState) { - this->timer = 0x80; + this->timer = 128; this->subtimer = 1; } } @@ -498,7 +498,7 @@ void VaatiTransfiguredType0Action6(Entity* this) { case 0: if (--this->timer == 0) { this->field_0x80.HALF.LO += 1; - this->timer = 0x80; + this->timer = 128; if (1 < this->animationState) { this->subtimer = 1; } @@ -514,7 +514,7 @@ void VaatiTransfiguredType0Action6(Entity* this) { CreateProjectileWithParent(this, V2_PROJECTILE, this->subtimer); } if (this->timer < 6) { - this->timer = 0x80; + this->timer = 128; this->subtimer = 0; } } else { @@ -634,7 +634,7 @@ void VaatiTransfiguredType2Action0(Entity* this) { sub_08040648(this, 2, 2); this->action = 1; this->timer = 0; - this->subtimer = (Random() & 0x7f) + 0x17; + this->subtimer = (Random() & 0x7f) + 23; this->field_0x74.HALF.LO = 0; InitAnimationForceUpdate(this, 0); } @@ -667,7 +667,7 @@ void VaatiTransfiguredType2Action1(Entity* this) { switch (this->field_0x74.HALF.LO) { case 0: if (--this->subtimer == 0) { - this->subtimer = (Random() & 0x7f) + 0x27; + this->subtimer = (Random() & 0x7f) + 39; if ((this->subtimer & 1) != 0) { this->field_0x74.HALF.LO = 1; InitAnimationForceUpdate(this, 8); @@ -677,14 +677,14 @@ void VaatiTransfiguredType2Action1(Entity* this) { case 1: if ((this->frame & ANIM_DONE) != 0) { this->field_0x74.HALF.LO = 0; - this->subtimer = (Random() & 0x7f) + 0x17; + this->subtimer = (Random() & 0x7f) + 23; InitAnimationForceUpdate(this, 0); } break; case 0x10: InitAnimationForceUpdate(this, 7); this->field_0x74.HALF.LO = 0x11; - this->subtimer = 0x50; + this->subtimer = 80; break; case 0x11: if (--this->subtimer == 0) { diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c index c1de6c3b..af1851c0 100644 --- a/src/enemy/vaatiWrath.c +++ b/src/enemy/vaatiWrath.c @@ -475,7 +475,7 @@ void VaatiWrathType0ActionB(Entity* this) { GetNextFrame(((VaatiWrathHeapStruct*)this->myHeap)->type2); if (GravityUpdate(this, Q_8_8(32.0)) == 0) { this->subAction = 1; - this->timer = 0xf0; + this->timer = 240; this->health = 8; this->hitType = 0x38; InitScreenShake(20, 0); @@ -685,7 +685,7 @@ void sub_08041E20(Entity* this) { GetNextFrame(((VaatiWrathHeapStruct*)this->myHeap)->type2); if (gFadeControl.active == 0) { this->subAction = 5; - this->timer = 0x5a; + this->timer = 90; } } diff --git a/src/enemy/wallMaster.c b/src/enemy/wallMaster.c index 85942393..18a1238c 100644 --- a/src/enemy/wallMaster.c +++ b/src/enemy/wallMaster.c @@ -74,7 +74,7 @@ void sub_0802A534(Entity* this) { Entity* ent = sub_08049DF4(1); if (ent != NULL) { this->action = 2; - this->timer = 0x5a; + this->timer = 90; COLLISION_ON(this); this->spriteSettings.draw = 3; this->x.HALF.HI = ent->x.HALF.HI; diff --git a/src/enemy/wisp.c b/src/enemy/wisp.c index 95404192..e978415e 100644 --- a/src/enemy/wisp.c +++ b/src/enemy/wisp.c @@ -73,7 +73,7 @@ void Wisp_OnCollision(Entity* this) { ent = CreateFx(this, FX_DEATH, 0); if (ent != NULL) { this->child = ent; - this->timer = 0xe; + this->timer = 14; CopyPosition(this, ent); } DeleteThisEntity(); diff --git a/src/enemy/wizzrobeFire.c b/src/enemy/wizzrobeFire.c index f0602eab..ef83c4f8 100644 --- a/src/enemy/wizzrobeFire.c +++ b/src/enemy/wizzrobeFire.c @@ -40,8 +40,8 @@ void WizzrobeFire_Init(WizzrobeEntity* this) { super->action = 1; this->timer2 = 0xff; this->timer1 = 0x28; - super->timer = 0x28; - super->subtimer = 0x60; + super->timer = 40; + super->subtimer = 96; sub_0802F888(this); projectile = CreateProjectileWithParent(super, FIRE_PROJECTILE, 0); if (projectile != NULL) { @@ -64,8 +64,8 @@ void WizzrobeFire_Action1(WizzrobeEntity* this) { break; case 0: if (--super->timer == 0) { - this->timer2 += 1; - super->timer = 0x0e; + this->timer2++; + super->timer = 14; super->flags |= 0x80; } break; @@ -92,8 +92,8 @@ void WizzrobeFire_Action2(WizzrobeEntity* this) { case 0: switch (--super->timer) { case 0: - this->timer2 += 1; - super->timer = 0x38; + this->timer2++; + super->timer = 56; super->subtimer = 0; super->child->spriteSettings.draw = 0; break; @@ -111,7 +111,7 @@ void WizzrobeFire_Action2(WizzrobeEntity* this) { if (--super->timer == 0) { this->timer2++; this->timer1 = 0x28; - super->timer = 0x28; + super->timer = 40; super->subtimer = 0; super->flags &= 0x7f; SetTile(this->tileIndex, this->tilePosition, super->collisionLayer); @@ -123,7 +123,7 @@ void WizzrobeFire_Action2(WizzrobeEntity* this) { case 2: if (--super->timer == 0) { this->timer2++; - super->timer = (Random() & 0x3f) + 0x1c; + super->timer = (Random() & 0x3f) + 28; super->spriteSettings.draw = 0; } break; @@ -132,7 +132,7 @@ void WizzrobeFire_Action2(WizzrobeEntity* this) { super->action = 1; this->timer2 = 0; this->timer1 = 0x28; - super->timer = 0x28; + super->timer = 40; EnqueueSFX(SFX_156); sub_0802F8E4(this); InitializeAnimation(super, super->direction >> 3); diff --git a/src/enemy/wizzrobeIce.c b/src/enemy/wizzrobeIce.c index a714c880..aade807b 100644 --- a/src/enemy/wizzrobeIce.c +++ b/src/enemy/wizzrobeIce.c @@ -49,8 +49,8 @@ void WizzrobeIce_Init(WizzrobeEntity* this) { super->action = 1; this->timer2 = 0xff; this->timer1 = 0x28; - super->timer = 0x28; - super->subtimer = 0x60; + super->timer = 40; + super->subtimer = 96; sub_0802F888(this); projectile = CreateProjectileWithParent(super, ICE_PROJECTILE, 0); if (projectile != NULL) { @@ -73,7 +73,7 @@ void WizzrobeIce_Action1(WizzrobeEntity* this) { case 0: if (--super->timer == 0) { this->timer2++; - super->timer = 0xc; + super->timer = 12; super->flags |= 0x80; } @@ -100,7 +100,7 @@ void WizzrobeIce_Action2(WizzrobeEntity* this) { switch (--super->timer) { case 0: this->timer2 += 1; - super->timer = 0x38; + super->timer = 56; super->subtimer = 0; super->child->spriteSettings.draw = 0; break; @@ -118,7 +118,7 @@ void WizzrobeIce_Action2(WizzrobeEntity* this) { if (--super->timer == 0) { this->timer2++; this->timer1 = 0x28; - super->timer = 0x28; + super->timer = 40; super->subtimer = 0; super->flags &= 0x7f; SetTile(this->tileIndex, this->tilePosition, super->collisionLayer); @@ -129,7 +129,7 @@ void WizzrobeIce_Action2(WizzrobeEntity* this) { case 2: if (--super->timer == 0) { this->timer2++; - super->timer = (Random() & 0x3f) + 0x18; + super->timer = (Random() & 0x3f) + 24; super->spriteSettings.draw = 0; } break; @@ -138,7 +138,7 @@ void WizzrobeIce_Action2(WizzrobeEntity* this) { super->action = 1; this->timer2 = 0; this->timer1 = 0x28; - super->timer = 0x28; + super->timer = 40; EnqueueSFX(SFX_156); sub_0802F8E4(this); InitializeAnimation(super, super->direction >> 3); diff --git a/src/enemy/wizzrobeWind.c b/src/enemy/wizzrobeWind.c index 8db28de4..8c157cde 100644 --- a/src/enemy/wizzrobeWind.c +++ b/src/enemy/wizzrobeWind.c @@ -65,8 +65,8 @@ void WizzrobeWind_Init(WizzrobeEntity* this) { super->action = 1; this->timer2 = 0xff; this->timer1 = 0x28; - super->timer = 0x28; - super->subtimer = 0x60; + super->timer = 40; + super->subtimer = 96; sub_0802F888(this); } projectile = CreateProjectileWithParent(super, WIND_PROJECTILE, 0); @@ -98,7 +98,7 @@ void WizzrobeWind_Action1(WizzrobeEntity* this) { if (--super->timer == 0) { super->action = 2; this->timer2 = 0; - super->timer = 0x28; + super->timer = 40; tmp = super->direction >> 3; parent = super->parent; parent->timer = 1; @@ -116,7 +116,7 @@ void WizzrobeWind_Action2(WizzrobeEntity* this) { switch (--super->timer) { case 0: this->timer2++; - super->timer = 0x38; + super->timer = 56; super->subtimer = 0; super->parent->spriteSettings.draw = 0; break; @@ -134,7 +134,7 @@ void WizzrobeWind_Action2(WizzrobeEntity* this) { if (--super->timer == 0) { this->timer2++; this->timer1 = 0x28; - super->timer = 0x28; + super->timer = 40; super->subtimer = 0; super->flags &= 0x7f; EnqueueSFX(SFX_156); @@ -145,7 +145,7 @@ void WizzrobeWind_Action2(WizzrobeEntity* this) { case 2: if (--super->timer == 0) { this->timer2++; - super->timer = (Random() & 0x3f) + 0x20; + super->timer = (Random() & 0x3f) + 32; super->spriteSettings.draw = 0; } break; @@ -154,7 +154,7 @@ void WizzrobeWind_Action2(WizzrobeEntity* this) { super->action = 1; this->timer2 = 0; this->timer1 = 0x28; - super->timer = 0x28; + super->timer = 40; EnqueueSFX(SFX_156); sub_0802F8E4(this); InitializeAnimation(super, super->direction >> 3); @@ -181,7 +181,7 @@ void WizzrobeWind_Action3(WizzrobeEntity* this) { return; } this->timer2++; - super->timer = 0x28; + super->timer = 40; parent->timer = 1; parent->spriteSettings.draw = 1; InitializeAnimation(super, super->animationState >> 1 | 4); @@ -189,7 +189,7 @@ void WizzrobeWind_Action3(WizzrobeEntity* this) { case 2: if (--super->timer == 0) { this->timer2++; - super->timer = (Random() & 0x1f) + 0x30; + super->timer = (Random() & 0x1f) + 48; parent->spriteSettings.draw = 0; InitializeAnimation(super, super->animationState >> 1); } else if (super->timer == 8) { diff --git a/src/manager/bombableWallManager.c b/src/manager/bombableWallManager.c index 2259411d..52d018bd 100644 --- a/src/manager/bombableWallManager.c +++ b/src/manager/bombableWallManager.c @@ -49,7 +49,7 @@ void BombableWallManager_Init(BombableWallManager* this) { void BombableWallManager_Action1(BombableWallManager* this) { if (sub_080B1AE0(this->tile, this->field_0x35) != 0x2e) { super->action = 2; - super->timer = 0x5a; + super->timer = 90; sub_0805C02C(this); SetLocalFlag(this->field_0x3e); } diff --git a/src/manager/bridgeManager.c b/src/manager/bridgeManager.c index cb37521e..17e91f91 100644 --- a/src/manager/bridgeManager.c +++ b/src/manager/bridgeManager.c @@ -40,7 +40,7 @@ void BridgeManager_Init(BridgeManager* this) { this->unk_2c = gUnk_08108034[tmp]; this->unk_2e = gUnk_08108034[tmp + 1]; this->unk_32 = ((super->type2 >> 2) & 0xF) + 1; - super->timer = 0x1C; + super->timer = 28; super->subtimer = 0; super->action = (super->type2 & 0x80) ? 2 : 1; if (super->action != 2 || !CheckFlags(this->flags)) diff --git a/src/manager/hyruleTownBellManager.c b/src/manager/hyruleTownBellManager.c index b271053b..b7348c75 100644 --- a/src/manager/hyruleTownBellManager.c +++ b/src/manager/hyruleTownBellManager.c @@ -19,7 +19,7 @@ void HyruleTownBellManager_Main(HyruleTownBellManager* this) { if (super->action == 0) { if (x < 0x20 && y < 0x20 && gPlayerEntity.z.HALF.HI < -0x18 && gPlayerState.framestate == PL_STATE_CAPE) { super->action++; - super->timer = 0x5a; + super->timer = 90; SoundReq(SFX_10A); } } else { diff --git a/src/manager/lightManager.c b/src/manager/lightManager.c index 89617f3e..9aa3df2c 100644 --- a/src/manager/lightManager.c +++ b/src/manager/lightManager.c @@ -62,7 +62,7 @@ void LightManager_Main(LightManager* this) { sub_0801E154(uVar3); this->unk20 = 0; } else if ((gRoomTransition.frameCount & 3) == 0) { - super->subtimer += 0x10; + super->subtimer += 16; sVar1 = gSineTable[super->subtimer]; this->unk20 = sVar1 >> 7; sub_0801E154(uVar3 + this->unk20); diff --git a/src/manager/rainfallManager.c b/src/manager/rainfallManager.c index 2826a2c9..787bafde 100644 --- a/src/manager/rainfallManager.c +++ b/src/manager/rainfallManager.c @@ -33,7 +33,7 @@ void RainfallManager_Action1(RainfallManager* this) { if (--super->timer == 0) { Entity* waterDrop; - super->timer = 0xf; + super->timer = 15; waterDrop = CreateEnemy(WATER_DROP, 0); if (waterDrop != NULL) { waterDrop->x.HALF.HI = gRoomControls.scroll_x + 0x78 + gUnk_08108C6C[Random() & 7]; diff --git a/src/manager/tileChangeObserveManager.c b/src/manager/tileChangeObserveManager.c index 5e5e805d..f2ada610 100644 --- a/src/manager/tileChangeObserveManager.c +++ b/src/manager/tileChangeObserveManager.c @@ -40,7 +40,7 @@ void TileChangeObserveManager_Init(TileChangeObserveManager* this) { void TileChangeObserveManager_Action1(TileChangeObserveManager* this) { if (this->initialTile != this->observedTile[0]) { super->action++; - super->timer = 0xf; + super->timer = 15; } } diff --git a/src/manager/vaatiAppearingManager.c b/src/manager/vaatiAppearingManager.c index 4b554226..ac4cd948 100644 --- a/src/manager/vaatiAppearingManager.c +++ b/src/manager/vaatiAppearingManager.c @@ -117,7 +117,7 @@ void VaatiAppearingManager_Action2(VaatiAppearingManager* this) { case 1: if (--super->timer == 0) { super->subAction = 2; - super->timer = 0x14; + super->timer = 20; } break; case 2: diff --git a/src/menu/kinstone_menu.c b/src/menu/kinstone_menu.c index 688b750c..814c1b39 100644 --- a/src/menu/kinstone_menu.c +++ b/src/menu/kinstone_menu.c @@ -255,7 +255,7 @@ void KinstoneMenu_Type3_Overlay1(void) { SetMenuType(4); } else { gMenu.overlayType = 2; - gMenu.transitionTimer = 0x14; + gMenu.transitionTimer = 20; gScreen.lcd.displayControl |= 0x2000; gScreen.controls.window0HorizontalDimensions = 0x6887; gScreen.controls.window0VerticalDimensions = 0x405f; @@ -331,7 +331,7 @@ void KinstoneMenu_Type5_Overlay2(void) { } else { gMenu.column_idx = 6; gMenu.overlayType = 3; - gMenu.transitionTimer = 0x4f; + gMenu.transitionTimer = 79; CreateObject(OBJECT_B3, 1, 0); SoundReq(SFX_1CA); } diff --git a/src/npc/bigGoron.c b/src/npc/bigGoron.c index b4c82439..cd3e1cae 100644 --- a/src/npc/bigGoron.c +++ b/src/npc/bigGoron.c @@ -190,7 +190,7 @@ void sub_0806D1D0(Entity* this) { case 0: default: if (--this->timer == 0) { - this->timer = (Random() & 0x7f) + 0x30; + this->timer = (Random() & 0x7f) + 48; this->subtimer = 8; this->frameIndex = 1; } diff --git a/src/npc/cat.c b/src/npc/cat.c index 541721c8..92154bbb 100644 --- a/src/npc/cat.c +++ b/src/npc/cat.c @@ -229,7 +229,7 @@ void sub_08067A0C(Entity* this) { if (this->frame & ANIM_DONE) { if (sub_08067D20(this) != 0) { sub_08067B80(this, 5); - this->timer = this->timer + 0x14; + this->timer += 20; } else { sub_08067C24(this); } @@ -303,7 +303,7 @@ void sub_08067B70(Entity* this) { void sub_08067B80(Entity* this, u32 param) { this->action = 5; - this->timer = 0x14; + this->timer = 20; this->field_0x74.HALF.LO = (Random() & 0x7f) + 0x1e; InitAnimationForceUpdate(this, param); sub_08067DDC(this); diff --git a/src/npc/cow.c b/src/npc/cow.c index d867d0ed..99f5514a 100644 --- a/src/npc/cow.c +++ b/src/npc/cow.c @@ -91,7 +91,7 @@ void sub_08069068(Entity* ent) { ent->animationState = anim; ent->direction = anim <<= 3; - ent->subtimer = (Random() & 0x3F) + 0x3C; + ent->subtimer = (Random() & 0x3F) + 60; InitAnimationForceUpdate(ent, ent->animationState + 4); } diff --git a/src/npc/cucco.c b/src/npc/cucco.c index 8a7110d8..173b183a 100644 --- a/src/npc/cucco.c +++ b/src/npc/cucco.c @@ -25,7 +25,7 @@ void Cucco_Init(Entity* this) { void sub_0806E4EC(Entity* this) { if (this->subAction == 0) { this->subAction += 1; - this->timer = (Random() & 0x1f) + 0x3c; + this->timer = (Random() & 0x1f) + 60; InitAnimationForceUpdate(this, 0); } if (--this->timer == 0) { diff --git a/src/npc/cuccoChick.c b/src/npc/cuccoChick.c index ffabb4dc..7947a99f 100644 --- a/src/npc/cuccoChick.c +++ b/src/npc/cuccoChick.c @@ -33,7 +33,7 @@ void CuccoChick_Init(Entity* this) { void sub_0806E764(Entity* this) { if (this->subAction == 0) { this->subAction += 1; - this->timer = (Random() & 0x1f) + 0x1e; + this->timer = (Random() & 0x1f) + 30; this->frameIndex = 0; } if (--this->timer == 0) { diff --git a/src/npc/dog.c b/src/npc/dog.c index ac2a742b..af62571a 100644 --- a/src/npc/dog.c +++ b/src/npc/dog.c @@ -95,7 +95,7 @@ void sub_08069C40(Entity* this) { this->timer -= 1; if (this->timer == 0) { this->action = 2; - this->timer = (Random() & 0x1f) + 0x1e; + this->timer = (Random() & 0x1f) + 30; this->direction = gUnk_08111DA8[Random() & 7]; sub_08069F6C(this); } @@ -166,7 +166,7 @@ void sub_08069D54(Entity* this) { } else { this->action = 3; } - this->timer = (Random() & 0x1f) + 0x1e; + this->timer = (Random() & 0x1f) + 30; } void sub_08069DF8(Entity* this) { @@ -185,7 +185,7 @@ void sub_08069DF8(Entity* this) { this->action = 3; } } - this->timer = (Random() & 0x1f) + 0x1e; + this->timer = (Random() & 0x1f) + 30; } void sub_08069E44(Entity* this) { diff --git a/src/npc/kid.c b/src/npc/kid.c index 19e02519..e546f3c8 100644 --- a/src/npc/kid.c +++ b/src/npc/kid.c @@ -53,7 +53,7 @@ void sub_08062130(Entity* this) { this->subtimer = 0; this->timer = (this->timer + 1) & 7; if (this->type == 6) { - this->timer = this->timer + 0x10; + this->timer = this->timer + 16; } InitAnimationForceUpdate(this, this->timer); } else { @@ -213,7 +213,7 @@ void sub_08062698(Entity* this) { } void sub_080626AC(Entity* this) { - this->timer = (Random() & 0x1f) + 0x40; + this->timer = (Random() & 0x1f) + 64; } void sub_080626C0(Entity* this, ScriptExecutionContext* context) { diff --git a/src/npc/npc5.c b/src/npc/npc5.c index ecfc685f..8c9948fd 100644 --- a/src/npc/npc5.c +++ b/src/npc/npc5.c @@ -553,7 +553,7 @@ void sub_08061358(Entity* this) { return; } this->subAction = 1; - this->timer = 0xf; + this->timer = 15; sub_08060E70(this, 0); break; case 1: @@ -565,7 +565,7 @@ void sub_08061358(Entity* this) { bVar4 = uVar2; if ((uVar2 & 1) == 0) { this->subAction = 3; - this->timer = (bVar4 & 0x18) + 0x1e; + this->timer = (bVar4 & 0x18) + 30; sub_08060E70(this, 4); return; } @@ -580,7 +580,7 @@ void sub_08061358(Entity* this) { this->animationState = ((this->frame & 0x18) >> 2); if ((Random() & 1)) { this->subAction = 3; - this->timer = (bVar4 & 0x18) + 0x1e; + this->timer = (bVar4 & 0x18) + 30; sub_08060E70(this, 4); return; } diff --git a/src/npc/postman.c b/src/npc/postman.c index 5b5946be..fd33d519 100644 --- a/src/npc/postman.c +++ b/src/npc/postman.c @@ -33,7 +33,7 @@ void Postman(Entity* this) { void sub_08060428(Entity* this) { void* data; - this->timer = 0x5a; + this->timer = 90; this->speed = 0x180; if (this->type2 != 0) { data = GetCurrentRoomProperty(this->type2); diff --git a/src/npc/rem.c b/src/npc/rem.c index e4fa2363..bd1bc6a4 100644 --- a/src/npc/rem.c +++ b/src/npc/rem.c @@ -166,11 +166,11 @@ void sub_0806A5E8(Entity* this) { if (this->action == 0) { this->action = 1; InitializeAnimation(this, 0x10); - this->timer = (Random() & 0x3f) + 0x3c; + this->timer = (Random() & 0x3f) + 60; } this->timer -= 1; if (this->timer == 0) { - this->timer = (Random() & 0x3f) + 0x78; + this->timer = (Random() & 0x3f) + 120; SoundReq(SFX_REM_SLEEP); } GetNextFrame(this); diff --git a/src/npc/vaatiReborn.c b/src/npc/vaatiReborn.c index 660d4ee0..a0e00fc0 100644 --- a/src/npc/vaatiReborn.c +++ b/src/npc/vaatiReborn.c @@ -32,7 +32,7 @@ void VaatiRebornAction0(Entity* this) { switch (this->type) { case 0: this->y.HALF.HI -= 0xa0; - this->timer = 0xa0; + this->timer = 160; this->subtimer = 32; this->spriteOffsetY = 0x20; for (i = 0; i < 4; i++) { 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; diff --git a/src/playerItem/playerItemBomb.c b/src/playerItem/playerItemBomb.c index ca56cc2e..af0450a6 100644 --- a/src/playerItem/playerItemBomb.c +++ b/src/playerItem/playerItemBomb.c @@ -48,7 +48,7 @@ void PlayerItemBomb(PlayerItemBombEntity* this) { super->timer -= 1; } if (super->timer == 0) { - super->subtimer = 0x50; + super->subtimer = 80; this->unk_68 = 0; super->spriteRendering.b0 = 3; SetAffineInfo(super, 0x100, 0x100, 0); @@ -61,7 +61,7 @@ void PlayerItemBomb(PlayerItemBombEntity* this) { } super->action = 0x03; super->spritePriority.b1 = 2; - super->timer = 0x0f; + super->timer = 15; super->spriteSettings.draw = 0; sub_0805EC60(super); FreeCarryEntity(super); @@ -83,7 +83,7 @@ void sub_0801B250(PlayerItemBombEntity* this) { if (super->type == 0xff) { super->timer = 60; } else if (super->type == 0xfe) { - super->timer = 0x0f; + super->timer = 15; super->type = 0xff; } else { super->timer = 150; diff --git a/src/playerItem/playerItemBottle.c b/src/playerItem/playerItemBottle.c index e2f1d57d..f7767a50 100644 --- a/src/playerItem/playerItemBottle.c +++ b/src/playerItem/playerItemBottle.c @@ -45,8 +45,8 @@ void PlayerItemBottle_Init(Entity* this) { this->hurtType = 0x1f; this->type = 1; this->type2 = ITEM_BOTTLE_EMPTY; - this->timer = 0x52; - this->subtimer = 0x1b; + this->timer = 82; + this->subtimer = 27; sub_0801766C(this); SoundReq(SFX_1DC); break; @@ -61,14 +61,14 @@ void PlayerItemBottle_Init(Entity* this) { case ITEM_BOTTLE_PICOLYTE_GREEN: case ITEM_BOTTLE_PICOLYTE_BLUE: case ITEM_BOTTLE_PICOLYTE_WHITE: - this->timer = 0xd5; + this->timer = 213; this->subtimer = 60; break; case BOTTLE_CHARM_NAYRU: case BOTTLE_CHARM_FARORE: case BOTTLE_CHARM_DIN: default: - this->timer = 0x37; + this->timer = 55; this->subtimer = 0; } this->action = 1; diff --git a/src/playerItem/playerItemGustBig.c b/src/playerItem/playerItemGustBig.c index 6a46fe94..7e69b965 100644 --- a/src/playerItem/playerItemGustBig.c +++ b/src/playerItem/playerItemGustBig.c @@ -65,7 +65,7 @@ void sub_08018CBC(Entity* this) { if (pEVar3 != NULL) { this->action = 1; COLLISION_OFF(this); - this->timer = 0x56; + this->timer = 86; this->hurtType = 0x1c; this->damage = 6; this->hitbox = (Hitbox*)&gUnk_080B3E18; diff --git a/src/playerItem/playerItemGustJar.c b/src/playerItem/playerItemGustJar.c index e140d3a3..fcd04f00 100644 --- a/src/playerItem/playerItemGustJar.c +++ b/src/playerItem/playerItemGustJar.c @@ -28,7 +28,7 @@ void PlayerItemGustJar(Entity* this) { void PlayerItemGustJar_Init(Entity* this) { this->action = 1; - this->subtimer = 0xf; + this->subtimer = 15; this->hitbox = &gUnk_08132B28; this->hitbox->unk2[2] = 3; this->hitbox->unk2[1] = 3; diff --git a/src/playerItem/playerItemLantern.c b/src/playerItem/playerItemLantern.c index 53aa62b2..84673867 100644 --- a/src/playerItem/playerItemLantern.c +++ b/src/playerItem/playerItemLantern.c @@ -18,8 +18,8 @@ void PlayerItemLantern(Entity* this) { void sub_08054A60(Entity* this) { this->flags |= (ENT_PERSIST | ENT_COLLIDE); - this->action = 0x01; - this->timer = 0x04; + this->action = 1; + this->timer = 4; this->frameIndex = -1; // TODO regalloc and mov 6 too early this->updatePriority = 6; diff --git a/src/playerItem/playerItemSwordBeam.c b/src/playerItem/playerItemSwordBeam.c index ec5160db..9231a294 100644 --- a/src/playerItem/playerItemSwordBeam.c +++ b/src/playerItem/playerItemSwordBeam.c @@ -70,7 +70,7 @@ void sub_08019580(Entity* this) { if (--*(int*)&this->field_0x6c != -1) { GetNextFrame(this); LinearMoveUpdate(this); - this->timer += 0x01; + this->timer += 1; if (this->type2 == 0) { sub_0800451C(this); } diff --git a/src/playerUtils.c b/src/playerUtils.c index 9391ed5d..d9fd0534 100644 --- a/src/playerUtils.c +++ b/src/playerUtils.c @@ -771,7 +771,7 @@ bool32 sub_08078108(ChargeState* state) { } bool32 sub_08078124(ChargeState* state) { - state->chargeTimer -= 0x10; + state->chargeTimer -= 16; if (state->chargeTimer < 0) { state->chargeTimer = 0; state->action = 2; diff --git a/src/projectile/arrowProjectile.c b/src/projectile/arrowProjectile.c index d01c4309..275a34fd 100644 --- a/src/projectile/arrowProjectile.c +++ b/src/projectile/arrowProjectile.c @@ -44,7 +44,7 @@ void ArrowProjectile_Init(Entity* this) { this->action = 1; this->spriteSettings.draw = 1; COLLISION_OFF(this); - this->timer = 0x6a; + this->timer = 106; this->subtimer = 0; this->zVelocity = Q_16_16(10.0 / 256.0); sub_080A94C0(this, this->type); diff --git a/src/projectile/gleerokProjectile.c b/src/projectile/gleerokProjectile.c index 47e82d59..b4957290 100644 --- a/src/projectile/gleerokProjectile.c +++ b/src/projectile/gleerokProjectile.c @@ -99,7 +99,7 @@ void GleerokProjectile_Action1(Entity* this) { this->action = 2; sub_080A90D8(this); if (this->type == 2) { - this->timer = 0xf; + this->timer = 15; InitializeAnimation(this, 0x54); } else { InitializeAnimation(this, 0x52); diff --git a/src/projectile/guardLineOfSight.c b/src/projectile/guardLineOfSight.c index 52c8cada..a55ded6b 100644 --- a/src/projectile/guardLineOfSight.c +++ b/src/projectile/guardLineOfSight.c @@ -46,7 +46,7 @@ void GuardLineOfSight(Entity* this) { } else { if (this->action == 0) { this->action = 1; - this->timer = 0x12; + this->timer = 18; this->spriteSettings.draw = 0; this->speed = 0x800; this->hitbox = (Hitbox*)&gUnk_080FD1E4; diff --git a/src/projectile/gyorgTail.c b/src/projectile/gyorgTail.c index c9ce481a..866d9c22 100644 --- a/src/projectile/gyorgTail.c +++ b/src/projectile/gyorgTail.c @@ -356,6 +356,6 @@ void sub_080AC884(Entity* this) { this->parent->field_0x70.HALF_U.HI = 0; this->action = 2; this->timer = 60; - this->subtimer = 0x56; + this->subtimer = 86; } } diff --git a/src/projectile/v1FireProjectile.c b/src/projectile/v1FireProjectile.c index 022b48f4..ea57dd16 100644 --- a/src/projectile/v1FireProjectile.c +++ b/src/projectile/v1FireProjectile.c @@ -73,7 +73,7 @@ void V1FireProjectile_Action1(Entity* this) { LinearMoveUpdate(this); if (GravityUpdate(this, 0) == 0) { this->action = 2; - this->timer = 0xf; + this->timer = 15; InitializeAnimation(this, 0x54); sub_080AB4A4(this); } else { diff --git a/src/projectile/v2Projectile.c b/src/projectile/v2Projectile.c index 072d745f..98e757bb 100644 --- a/src/projectile/v2Projectile.c +++ b/src/projectile/v2Projectile.c @@ -88,7 +88,7 @@ void sub_080ABC90(Entity* this) { void sub_080ABCC4(Entity* this) { this->action = 1; - this->timer = (Random() & 0x3f) + 0x30; + this->timer = (Random() & 0x3f) + 48; this->subtimer = 0; this->direction = Random() & 0x1f; this->field_0x74.HWORD = TILE(this->x.HALF.HI, this->y.HALF.HI); @@ -159,7 +159,7 @@ void sub_080ABE88(Entity* this) { void sub_080ABEA8(Entity* this) { this->action = 1; - this->timer = 0x60; + this->timer = 96; this->spritePriority.b0 = 2; this->gustJarFlags = 1; if (this->type2 == 0) { diff --git a/src/projectile/v3ElectricProjectile.c b/src/projectile/v3ElectricProjectile.c index c1b42c32..beec1f6a 100644 --- a/src/projectile/v3ElectricProjectile.c +++ b/src/projectile/v3ElectricProjectile.c @@ -31,7 +31,7 @@ void sub_080ABFEC(Entity* this) { case 0: { this->action = 1; this->timer = 0; - this->subtimer = 0x7; + this->subtimer = 7; this->cutsceneBeh.HALF.HI = 0x18; this->damage = 0x88; CopyPositionAndSpriteOffset(this->parent, this); diff --git a/src/subtask.c b/src/subtask.c index 9e5130f6..950e7f3f 100644 --- a/src/subtask.c +++ b/src/subtask.c @@ -531,7 +531,7 @@ void sub_08055634(void) { obj->y.HALF.HI = gRoomControls.origin_y + *(s16*)(ptr + 10); } gMenu.overlayType++; - gMenu.transitionTimer = 0x186; + gMenu.transitionTimer = 390; } void sub_08055674(void) {