diff options
Diffstat (limited to 'src')
74 files changed, 130 insertions, 137 deletions
diff --git a/src/enemy/cloudPiranha.c b/src/enemy/cloudPiranha.c index ea8178e7..267cc52a 100644 --- a/src/enemy/cloudPiranha.c +++ b/src/enemy/cloudPiranha.c @@ -90,7 +90,7 @@ void CloudPiranha_Init(CloudPiranhaEntity* this) { super->animationState = super->direction >> 2; super->flags |= ENT_COLLIDE; super->timer = 0; - super->subtimer = 0x20; + super->subtimer = 32; this->unk_82 = 0; this->unk_80 = Random() & 1; this->unk_81 = 0; @@ -103,7 +103,7 @@ void CloudPiranha_Action1(CloudPiranhaEntity* this) { sub_080387F0(this); if (--super->subtimer == 0) { super->timer = 0; - super->subtimer = 0x20; + super->subtimer = 32; if (sub_08049FA0(super)) { u32 tmp = super->animationState; if (this->unk_80 != 0) { @@ -120,7 +120,7 @@ void CloudPiranha_Action1(CloudPiranhaEntity* this) { InitializeAnimation(super, (u32)super->animationState); } else if ((super->timer == 0) && sub_0803872C(this, 0x80)) { super->action = 2; - super->subtimer = 0x10; + super->subtimer = 16; super->speed = 0x40; super->animationState = sub_0806FCAC(super, super->child); super->direction = super->animationState << 2; @@ -140,7 +140,7 @@ void sub_080385CC(CloudPiranhaEntity* this) { InitializeAnimation(super, super->animationState); } else { if (--super->subtimer == 0) { - super->subtimer = 0x10; + super->subtimer = 16; if (super->child != NULL) { super->animationState = sub_0806FCAC(super, super->child); } else { @@ -160,7 +160,7 @@ void CloudPiranha_Action3(CloudPiranhaEntity* this) { sub_08038754(this); } else { if (--super->subtimer == 0) { - super->subtimer = 0xa; + super->subtimer = 10; if (this->unk_81 == 0) { tmp = super->speed += 0x40; if (0x2000000 < (tmp * 0x10000)) { diff --git a/src/enemy/crow.c b/src/enemy/crow.c index 71f46658..bd2fb325 100644 --- a/src/enemy/crow.c +++ b/src/enemy/crow.c @@ -42,7 +42,7 @@ void Crow_OnCollision(CrowEntity* this) { if (super->contactFlags & 0x80) { if ((super->contactFlags & 0x3f) == 0) { COLLISION_OFF(super); - super->subtimer = 0x10; + super->subtimer = 16; if (DirectionIsHorizontal(DirectionRoundUp(super->direction)) == 0) { if (DirectionIsVertical(super->direction)) { super->direction += 2; diff --git a/src/enemy/gyorgFemale.c b/src/enemy/gyorgFemale.c index 8b5dc2a0..6198b88b 100644 --- a/src/enemy/gyorgFemale.c +++ b/src/enemy/gyorgFemale.c @@ -132,7 +132,7 @@ void GyorgFemale_Action1(GyorgFemaleEntity* this) { } if (((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x100) { if (--this->childrenSpawnTimer == 0) { - this->childrenSpawnTimer = 0x168; + this->childrenSpawnTimer = 360; GyorgFemale_SpawnChildren(this, TRUE); } } @@ -160,7 +160,7 @@ void GyorgFemale_Action2(GyorgFemaleEntity* this) { } } if (((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x80 && --this->childrenSpawnTimer == 0) { - this->childrenSpawnTimer = 0x168; + this->childrenSpawnTimer = 360; GyorgFemale_SpawnChildren(this, 0); } if ((((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x38) == 0) { @@ -176,7 +176,7 @@ void GyorgFemale_Action2(GyorgFemaleEntity* this) { void GyorgFemale_Action3(GyorgFemaleEntity* this) { sub_080465C8(); if (--this->childrenSpawnTimer == 0) { - this->childrenSpawnTimer = 0x168; + this->childrenSpawnTimer = 360; GyorgFemale_SpawnChildren(this, 1); } GyorgFemale_ProcessEyeHit(this); diff --git a/src/enemy/mulldozer.c b/src/enemy/mulldozer.c index ff883619..69ec5ed2 100644 --- a/src/enemy/mulldozer.c +++ b/src/enemy/mulldozer.c @@ -234,7 +234,7 @@ void sub_08032F90(MulldozerEntity* this) { void sub_08033000(MulldozerEntity* this) { if (--super->subtimer == 0) { - super->subtimer = 0x10; + super->subtimer = 16; if ((this->unk_82 & 0x80) != 0) { super->direction = (super->direction + 0x18) & 0x1c; this->unk_82 &= 0x7f; diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c index fe3b6a19..b743634f 100644 --- a/src/enemy/octorokBoss.c +++ b/src/enemy/octorokBoss.c @@ -228,7 +228,7 @@ void OctorokBoss_Hit_SubAction2(OctorokBossEntity* this) { this->heap->tailObjects[0]->currentAttack++; } else { super->subAction = 3; - this->timer = 0x96; + this->timer = 150; gRoomControls.camera_target = &gPlayerEntity; } } @@ -380,7 +380,7 @@ void OctorokBoss_Intro_SubAction3(OctorokBossEntity* this) { void OctorokBoss_Intro_SubAction4(OctorokBossEntity* this) { if (this->timer-- == 0) { super->subAction = 5; - this->timer = 0x2d; + this->timer = 45;; // Make the player look towards the exit gPlayerEntity.animationState = 0; } else { @@ -692,7 +692,7 @@ void OctorokBoss_Action1_Attack_Type2_0(OctorokBossEntity* this) { this->angularSpeed.HWORD = 0x100; super->type2 = 1; if (IS_FROZEN(this) == FALSE) { - this->timer = 0x16; + this->timer = 22; } else { this->timer = 0; } @@ -715,7 +715,7 @@ void OctorokBoss_Action1_Attack_Type2_1(OctorokBossEntity* this) { this->heap->targetAngle = this->angle.HALF.HI; } else { super->type2 = 2; - this->timer = 0x2d; + this->timer = 45;; } SoundReq(SFX_155); } @@ -813,7 +813,7 @@ void OctorokBoss_ExecuteAttackVacuum(OctorokBossEntity* this) { if (this->unk_80 == 1) { this->unk_80 = 2; super->type2 = 2; - this->timer = 0x2d; + this->timer = 45;; this->angularSpeed.HWORD = 0x100; this->heap->field_0x2 = 0; return; diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c index cd90c578..ee374b41 100644 --- a/src/enemy/pesto.c +++ b/src/enemy/pesto.c @@ -159,7 +159,7 @@ void sub_080240B8(Entity* this) { this->field_0x86.HALF.LO = 0; this->field_0x86.HALF.HI = 0; this->timer = 0; - this->subtimer = 0x20; + this->subtimer = 32; this->collisionFlags |= 0x10; this->gustJarFlags = 2; this->direction = direction; @@ -763,7 +763,7 @@ void sub_08024D00(Entity* this) { this->direction += this->field_0x80.HALF.HI ? 1 : 0x1f; this->direction &= 0x1f; - this->subtimer = 0x10; + this->subtimer = 16; sub_080249DC(this); } } diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c index dfa5ab20..1311fcd7 100644 --- a/src/enemy/puffstool.c +++ b/src/enemy/puffstool.c @@ -295,7 +295,7 @@ void sub_08025514(Entity* this) { this->field_0x80.HALF.HI = 120; } else if (3 < this->timer) { this->action = 10; - this->timer = 0x20; + this->timer = 32; } } diff --git a/src/enemy/scissorsBeetle.c b/src/enemy/scissorsBeetle.c index d70a1277..46a39494 100644 --- a/src/enemy/scissorsBeetle.c +++ b/src/enemy/scissorsBeetle.c @@ -112,18 +112,18 @@ void sub_08038A70(ScissorsBeetleEntity* this) { super->action = 3; this->unk_82 = 4; super->speed = 0x80; - super->subtimer = 0x20; + super->subtimer = 32; child->action = 3; ((ScissorsBeetleEntity*)child)->unk_82 = 2; child->animationState = 0xff; sub_08038C84(this, 0); sub_08038C2C((ScissorsBeetleEntity*)child); - child->subtimer = 0x20; + child->subtimer = 32; child->parent = NULL; child->child = super; } else if (--super->subtimer == 0) { u32 dir; - super->subtimer = 0x10; + super->subtimer = 16; super->direction = sub_08049F84(super, 0); dir = (super->direction + 4) & 0x1c; child->animationState = dir >> 2; diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c index e75173f2..5c4ca544 100644 --- a/src/enemy/smallPesto.c +++ b/src/enemy/smallPesto.c @@ -135,7 +135,7 @@ void sub_080317F8(Entity* this) { this->hitbox = (Hitbox*)&gUnk_080CE560; sub_080317E0(this); this->timer = 0; - this->subtimer = 0x20; + this->subtimer = 32; } void sub_08031840(Entity* this) { diff --git a/src/enemy/spearMoblin.c b/src/enemy/spearMoblin.c index 58c92d23..819f4e79 100644 --- a/src/enemy/spearMoblin.c +++ b/src/enemy/spearMoblin.c @@ -316,7 +316,7 @@ void sub_08028784(Entity* this) { void sub_080287B4(Entity* this) { this->action = 3; - this->timer = 0x20; + this->timer = 32; this->subtimer = 0; this->field_0x80.HALF.LO = 0; this->field_0x7a.HALF.HI = 0; diff --git a/src/enemy/spikedBeetle.c b/src/enemy/spikedBeetle.c index 5e796cb3..36deab65 100644 --- a/src/enemy/spikedBeetle.c +++ b/src/enemy/spikedBeetle.c @@ -156,7 +156,7 @@ void sub_0802B8B0(Entity* this) { switch (sub_080044EC(this, 0x1800)) { case 0: this->action = 7; - this->timer = 0x96; + this->timer = 150; /* fallthrough */ case 1: EnqueueSFX(SFX_12B); diff --git a/src/enemy/spinyBeetle.c b/src/enemy/spinyBeetle.c index 2b305415..75c11751 100644 --- a/src/enemy/spinyBeetle.c +++ b/src/enemy/spinyBeetle.c @@ -52,7 +52,7 @@ void SpinyBeetle_OnCollision(SpinyBeetleEntity* this) { if ((super->contactFlags & 0x3f) == 0x14 && super->action != 5) { super->action = 3; super->timer = 0x5a; - super->subtimer = 0x10; + super->subtimer = 16; super->spritePriority.b1 = 1; super->direction = DirectionRoundUp(sub_08049F84(super, 1)); sub_08033D78(this); @@ -176,7 +176,7 @@ void sub_08033A7C(SpinyBeetleEntity* this) { super->action = 3; super->timer = 120; - super->subtimer = 0x20; + super->subtimer = 32; super->spritePriority.b1 = 1; InitializeAnimation(super, 3); } @@ -361,7 +361,7 @@ void sub_08033E1C(SpinyBeetleEntity* this) { super->y.WORD = (super->y.WORD & 0xfff00000) | 0xC0000; super->hitType = 0x19; super->spritePriority.b1 = 1; - super->timer = 0x30; + super->timer = 48; super->subtimer = 0; super->speed = 0x100; super->child = NULL; diff --git a/src/enemy/stalfos.c b/src/enemy/stalfos.c index e58091d3..ec52cce9 100644 --- a/src/enemy/stalfos.c +++ b/src/enemy/stalfos.c @@ -176,8 +176,7 @@ void Stalfos_Init(StalfosEntity* this) { void Stalfos_Action1(StalfosEntity* this) { if (GravityUpdate(super, Q_8_8(24.0)) == 0 && sub_08039758(this) == 0 && --this->unk_78 == 0) { super->action = 2; - super->timer = 0xa; - sub_08039858(this); + super->timer = 10; sub_08039858(this); } } @@ -228,8 +227,7 @@ void Stalfos_Action6(StalfosEntity* this) { tmp = super->z.HALF.HI += 4; if (-1 < (tmp * 0x10000)) { super->action = 7; - super->timer = 0xa; - super->z.HALF.HI = 0; + super->timer = 10; super->z.HALF.HI = 0; this->unk_7a = 0x78; this->unk_7c = 0x3c; sub_080399C4(this); diff --git a/src/enemy/takkuri.c b/src/enemy/takkuri.c index 41de753b..1d55d496 100644 --- a/src/enemy/takkuri.c +++ b/src/enemy/takkuri.c @@ -137,7 +137,7 @@ void sub_0803BD08(TakkuriEntity* this) { if (gUnk_020000B0->y.HALF.HI > super->y.HALF.HI + 8) { super->action = 2; this->unk_0x84 = 0; - super->timer = 0x10; + super->timer = 16; this->unk_0x81 = 2; sub_0803BF2C(this); } diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c index 0f490883..fe0d3667 100644 --- a/src/enemy/tektite.c +++ b/src/enemy/tektite.c @@ -120,14 +120,14 @@ void sub_0802F284(Entity* this) { } else if (this->subtimer != 0) { if (this->frame & ANIM_DONE) { this->action = 2; - this->timer = 0x10; + this->timer = 16; this->subtimer = this->type; this->zVelocity = this->field_0x82.HWORD << 4; sub_0802F45C(this); InitializeAnimation(this, 2); } } else if (this->frame & ANIM_DONE) { - this->subtimer = 0x40; + this->subtimer = 64; InitializeAnimation(this, 1); } } @@ -163,7 +163,7 @@ void sub_0802F300(Entity* this) { } if (--this->timer == 0) { - this->timer = 0x10; + this->timer = 16; if (this->subtimer != 0) { this->subtimer--; sub_0802F45C(this); @@ -191,7 +191,7 @@ void sub_0802F3F4(Entity* this) { if (this->frame & ANIM_DONE) { if ((*(u8*)&this->field_0x7c.HALF.LO < 2) && ((this->type % 2) != 0)) { this->action = 2; - this->timer = 0x10; + this->timer = 16; this->subtimer = this->type; this->zVelocity = this->field_0x82.HWORD << 4; (*(u8*)&this->field_0x7c.HALF.LO)++; diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c index 1ea22b88..06c5aec5 100644 --- a/src/enemy/tektiteGolden.c +++ b/src/enemy/tektiteGolden.c @@ -112,7 +112,7 @@ void sub_08037Fe0(Entity* this) { InitializeAnimation(this, 2); } } else if (this->frame & ANIM_DONE) { - this->subtimer = 0x40; + this->subtimer = 64; InitializeAnimation(this, 1); } } diff --git a/src/enemy/vaatiRebornEnemy.c b/src/enemy/vaatiRebornEnemy.c index 7a623abb..fb38afb6 100644 --- a/src/enemy/vaatiRebornEnemy.c +++ b/src/enemy/vaatiRebornEnemy.c @@ -148,7 +148,7 @@ void VaatiRebornEnemyType0Action1(Entity* this) { if (this->field_0x74.HALF.HI != 0) { this->action = 2; this->field_0x74.HALF.LO = 0; - this->timer = 0x10; + this->timer = 16; this->direction = 0xff; } else { if ((this->field_0x86.HALF.LO != 0) || (this->field_0x80.HALF.LO != 0)) { @@ -189,12 +189,12 @@ void VaatiRebornEnemyType0Action1(Entity* this) { case 3: this->action = 5; this->field_0x74.HALF.LO = 0; - this->subtimer = 0x20; + this->subtimer = 32; this->direction = 0xff; break; case 2: this->field_0x74.HALF.LO = 0; - this->timer = 0x20; + this->timer = 32; if ((this->field_0x86.HALF.LO != 0) || (this->field_0x80.HALF.LO != 0)) { this->direction = ((Random() & 0x80) >> 3) | 8; } else { @@ -229,7 +229,7 @@ void VaatiRebornEnemyType0Action2(Entity* this) { case 0: if (--this->timer == 0) { this->field_0x74.HALF.LO++; - this->timer = 0x20; + this->timer = 32; InitAnimationForceUpdate(this, 3); SoundReq(SFX_19B); } @@ -238,7 +238,7 @@ void VaatiRebornEnemyType0Action2(Entity* this) { if ((this->frame & ANIM_DONE) != 0) { this->field_0x74.HALF.LO = 2; this->spriteSettings.draw = 0; - this->timer = 0x10; + this->timer = 16; } break; case 2: @@ -254,7 +254,7 @@ void VaatiRebornEnemyType0Action2(Entity* this) { this->y.HALF.HI = gRoomControls.origin_y + ptr->HALF.y + 0x10; } this->spriteSettings.draw = 1; - this->timer = 0x20; + this->timer = 32; InitAnimationForceUpdate(this, 4); SoundReq(SFX_F5); } @@ -271,7 +271,7 @@ void VaatiRebornEnemyType0Action2(Entity* this) { this->timer = 1; } else { this->field_0x74.HALF.LO = 0; - this->timer = 0x10; + this->timer = 16; } InitAnimationForceUpdate(this, 0); } @@ -398,7 +398,7 @@ void VaatiRebornEnemyType0Action5(Entity* this) { } else { this->field_0x74.HALF.LO++; this->field_0x86.HALF.HI = 0; - this->subtimer = 0x30; + this->subtimer = 48; InitAnimationForceUpdate(this, 0); } } diff --git a/src/enemy/vaatiTransfigured.c b/src/enemy/vaatiTransfigured.c index 8a798b54..d1dd3abb 100644 --- a/src/enemy/vaatiTransfigured.c +++ b/src/enemy/vaatiTransfigured.c @@ -304,7 +304,7 @@ void VaatiTransfiguredType0Action3(Entity* this) { this->child->field_0x74.HALF.LO = 0x10; if (this->timer) { this->field_0x80.HALF.LO = 3; - this->timer = 0x40; + this->timer = 64; } else { this->field_0x80.HALF.LO = 4; this->timer = 0x50; @@ -315,13 +315,13 @@ void VaatiTransfiguredType0Action3(Entity* this) { if (--this->timer == 0) { COLLISION_OFF(this); this->zVelocity = Q_16_16(3.5); - this->subtimer = 0x10; + this->subtimer = 16; } break; } if (GravityUpdate(this, Q_8_8(40.0)) == 0) { this->field_0x80.HALF.LO = 5; - this->timer = 0x10; + this->timer = 16; COLLISION_ON(this); this->health = 0xff; this->field_0x86.HALF.LO = 0; @@ -343,7 +343,7 @@ void VaatiTransfiguredType0Action3(Entity* this) { case 4: if (--this->timer == 0) { this->field_0x80.HALF.LO = 5; - this->timer = 0x10; + this->timer = 16; this->field_0x86.HALF.LO = 0; sub_080408EC(this); } else { @@ -445,7 +445,7 @@ void VaatiTransfiguredType0Action5(Entity* this) { case 0: if (--this->timer == 0) { this->field_0x80.HALF.LO += 1; - this->timer = 0x40; + this->timer = 64; if (1 < this->animationState) { this->timer = 0x80; this->subtimer = 1; @@ -462,7 +462,7 @@ void VaatiTransfiguredType0Action5(Entity* this) { CreateProjectileWithParent(this, V2_PROJECTILE, this->subtimer); } if (this->timer < 6) { - this->timer = 0x40; + this->timer = 64; this->subtimer = 0; } } else { @@ -689,7 +689,7 @@ void VaatiTransfiguredType2Action1(Entity* this) { case 0x11: if (--this->subtimer == 0) { this->field_0x74.HALF.LO = 1; - this->subtimer = 0x30; + this->subtimer = 48; InitAnimationForceUpdate(this, 8); } } diff --git a/src/enemy/vaatiTransfiguredEye.c b/src/enemy/vaatiTransfiguredEye.c index 04980820..2f6a632e 100644 --- a/src/enemy/vaatiTransfiguredEye.c +++ b/src/enemy/vaatiTransfiguredEye.c @@ -188,7 +188,7 @@ void VaatiTransfiguredEyeFunction0Action4(Entity* this) { sub_08045A28(this); if (this->subtimer == 0) { if ((this->frame & ANIM_DONE) != 0) { - this->subtimer = 0x20; + this->subtimer = 32; } } else { parent = this->parent; diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c index 69b92375..c1de6c3b 100644 --- a/src/enemy/vaatiWrath.c +++ b/src/enemy/vaatiWrath.c @@ -645,7 +645,7 @@ void sub_08041D14(Entity* this) { pEVar1 = CreateObject(OBJECT_B6, 1, 0); pEVar1->parent = this; this->subAction = 3; - this->timer = 0x96; + this->timer = 150; this->subtimer = 0; this->spriteSettings.draw = 0; SoundReq(SFX_1C4); diff --git a/src/enemy/wizzrobeFire.c b/src/enemy/wizzrobeFire.c index 714f3866..f0602eab 100644 --- a/src/enemy/wizzrobeFire.c +++ b/src/enemy/wizzrobeFire.c @@ -73,7 +73,7 @@ void WizzrobeFire_Action1(WizzrobeEntity* this) { if (--super->timer == 0) { super->action = 2; this->timer2 = 0; - super->timer = 0x20; + super->timer = 32; tmp = super->direction >> 3; child = super->child; child->timer = 1; diff --git a/src/enemy/wizzrobeIce.c b/src/enemy/wizzrobeIce.c index 78397f59..a714c880 100644 --- a/src/enemy/wizzrobeIce.c +++ b/src/enemy/wizzrobeIce.c @@ -82,7 +82,7 @@ void WizzrobeIce_Action1(WizzrobeEntity* this) { if (--super->timer == 0) { super->action = 2; this->timer2 = 0; - super->timer = 0x20; + super->timer = 32; tmp = super->direction >> 3; child = super->child; child->timer = 1; diff --git a/src/enemy/wizzrobeWind.c b/src/enemy/wizzrobeWind.c index 79fe7f9a..8db28de4 100644 --- a/src/enemy/wizzrobeWind.c +++ b/src/enemy/wizzrobeWind.c @@ -90,7 +90,7 @@ void WizzrobeWind_Action1(WizzrobeEntity* this) { case 0: if (--super->timer == 0) { this->timer2++; - super->timer = 0x10; + super->timer = 16; super->flags |= 0x80; } break; @@ -174,7 +174,7 @@ void WizzrobeWind_Action3(WizzrobeEntity* this) { switch (this->timer2) { case 0: this->timer2 = 1; - super->timer = 0x40; + super->timer = 64; break; case 1: if (--super->timer != 0) { diff --git a/src/manager/angryStatueManager.c b/src/manager/angryStatueManager.c index d8b0fc9e..691a8e3a 100644 --- a/src/manager/angryStatueManager.c +++ b/src/manager/angryStatueManager.c @@ -52,7 +52,7 @@ void AngryStatueManager_Init(AngryStatueManager* this) { void AngryStatueManager_Action1(AngryStatueManager* this) { if (--super->subtimer == 0) { - super->subtimer = 0xb4; + super->subtimer = 180; } if (this->field_0x36 == 0xf) { super->action = 2; diff --git a/src/manager/miscManager.c b/src/manager/miscManager.c index 147dfb06..9ba3d440 100644 --- a/src/manager/miscManager.c +++ b/src/manager/miscManager.c @@ -246,7 +246,7 @@ void MiscManager_Type5(MiscManager* this) { case 1: if (CheckFlags(this->unk_3e)) { RequestPriorityDuration((Entity*)this, 0x4b); - super->timer = 0x2d; + super->timer = 45;; super->action++; } } diff --git a/src/manager/rollingBarrelManager.c b/src/manager/rollingBarrelManager.c index 580734d9..56337dfe 100644 --- a/src/manager/rollingBarrelManager.c +++ b/src/manager/rollingBarrelManager.c @@ -78,7 +78,7 @@ void sub_080588F8(RollingBarrelManager* this) { case 0xa0: case 0xf0: this->unk_28 = this->unk_24.HALF.HI; - super->subtimer = 0x2D; + super->subtimer = 45;; SoundReq(SFX_BARREL_ROLL_STOP); } } diff --git a/src/manager/templeOfDropletsManager.c b/src/manager/templeOfDropletsManager.c index 38e0aac4..8377d455 100644 --- a/src/manager/templeOfDropletsManager.c +++ b/src/manager/templeOfDropletsManager.c @@ -406,7 +406,7 @@ void sub_0805A89C(TempleOfDropletsManager* this) { super->action = 1; super->flags |= ENT_PERSIST; super->timer = 8; - super->subtimer = 0x10; + super->subtimer = 16; this->unk_21 = 0; this->unk_22 = 0; this->unk_20 = gRoomControls.room; @@ -498,7 +498,7 @@ void sub_0805AA58(TempleOfDropletsManager* this) { LoadPalettes(gUnk_085A97A0[this->unk_21].unk_00, 5, 1); } if (--super->subtimer == 0) { - super->subtimer = 0x10; + super->subtimer = 16; this->unk_22 += 1; this->unk_22 &= 0xF; gScreen.controls.alphaBlend = gUnk_081085B8[this->unk_22]; diff --git a/src/manager/tilePuzzleManager.c b/src/manager/tilePuzzleManager.c index 575c350e..a229878f 100644 --- a/src/manager/tilePuzzleManager.c +++ b/src/manager/tilePuzzleManager.c @@ -45,7 +45,7 @@ void TilePuzzleManager_Main(TilePuzzleManager* this) { if (--super->timer == 0) { super->action = SUCCEEDED; // set up delay for setting the flag/playing the success sfx - super->timer = 0x40; + super->timer = 64; } break; } diff --git a/src/manager/vaatiAppearingManager.c b/src/manager/vaatiAppearingManager.c index fd041722..4b554226 100644 --- a/src/manager/vaatiAppearingManager.c +++ b/src/manager/vaatiAppearingManager.c @@ -83,7 +83,7 @@ void VaatiAppearingManager_Action1(VaatiAppearingManager* this) { case 1: if (--this->field_0x20 == 0x10) { super->subAction = 2; - super->timer = 0x2d; + super->timer = 45;; } break; case 2: @@ -110,7 +110,7 @@ void VaatiAppearingManager_Action2(VaatiAppearingManager* this) { switch (super->subAction) { case 0: super->subAction = 1; - super->timer = 0x2d; + super->timer = 45;; this->field_0x20 = 1; gScreen.lcd.displayControl |= DISPCNT_BG3_ON; break; diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c index eb73c163..c9f597c0 100644 --- a/src/npc/bladeBrothers.c +++ b/src/npc/bladeBrothers.c @@ -75,7 +75,7 @@ void sub_08068A4C(Entity* this) { uVar1 = 2; } else { if (this->subtimer == 0) { - this->subtimer = 0x10; + this->subtimer = 16; } else { this->subtimer--; uVar1 = (u32)this->animIndex; diff --git a/src/npc/ghostBrothers.c b/src/npc/ghostBrothers.c index b8df90f0..15d11888 100644 --- a/src/npc/ghostBrothers.c +++ b/src/npc/ghostBrothers.c @@ -158,7 +158,7 @@ void sub_08065DB8(Entity* this) { case 1: { if (--this->timer == 0) { this->subAction++; - this->timer = 0xb4; + this->timer = 180; gUnk_02018EB0.unk_1++; InitAnimationForceUpdate(this, 2); } diff --git a/src/npc/gorman.c b/src/npc/gorman.c index cbac8031..fbeb916d 100644 --- a/src/npc/gorman.c +++ b/src/npc/gorman.c @@ -53,7 +53,7 @@ void sub_080697EC(Entity* this) { tmp = GetAnimationStateInRectRadius(this, 0x20, 0x20); if (tmp >= 0) { if (this->subtimer == 0) { - this->subtimer = 0x10; + this->subtimer = 16; if (this->animIndex != tmp) { InitializeAnimation(this, tmp); } diff --git a/src/npc/kingDaltus.c b/src/npc/kingDaltus.c index 647c535d..bb7c4743 100644 --- a/src/npc/kingDaltus.c +++ b/src/npc/kingDaltus.c @@ -50,7 +50,7 @@ void sub_08066688(Entity* this) { tmp = 2; } else { if (this->subtimer == 0) { - this->subtimer = 0x10; + this->subtimer = 16; } else { this->subtimer -= 1; tmp = this->animIndex; diff --git a/src/npc/melari.c b/src/npc/melari.c index e08032d0..73b86a1a 100644 --- a/src/npc/melari.c +++ b/src/npc/melari.c @@ -39,7 +39,7 @@ void sub_08068730(Entity* this) { animIndex = GetAnimationStateInRectRadius(this, 0x20, 0x20); if (-1 < animIndex) { if (this->subtimer == 0) { - this->subtimer = 0x10; + this->subtimer = 16; if (this->animIndex != animIndex) { InitializeAnimation(this, animIndex); } @@ -129,7 +129,7 @@ void sub_08068910(Entity* this) { if (this->timer != 0) { this->timer--; } else { - this->timer = 0x10; + this->timer = 16; if ((this->frame & 0x20) != 0) { iVar1 = GetFacingDirectionInRectRadius(this, 0x30, 0x30); if (iVar1 < 0) { diff --git a/src/npc/ministerPotho.c b/src/npc/ministerPotho.c index 1cdd7a18..d746dbaf 100644 --- a/src/npc/ministerPotho.c +++ b/src/npc/ministerPotho.c @@ -36,7 +36,7 @@ void sub_08066808(Entity* this) { tmp = 2; } else { if (this->subtimer == 0) { - this->subtimer = 0x10; + this->subtimer = 16; } else { this->subtimer -= 1; tmp = this->animIndex; diff --git a/src/npc/mountainMinish.c b/src/npc/mountainMinish.c index 4c93569c..4901ae30 100644 --- a/src/npc/mountainMinish.c +++ b/src/npc/mountainMinish.c @@ -70,7 +70,7 @@ void sub_08067E88(Entity* this) { tmp = 2; } else { if (this->subtimer == 0) { - this->subtimer = 0x10; + this->subtimer = 16; } else { this->subtimer = this->subtimer - 1; tmp = this->animIndex; diff --git a/src/npc/npc26.c b/src/npc/npc26.c index 99e58286..a9c19cf2 100644 --- a/src/npc/npc26.c +++ b/src/npc/npc26.c @@ -30,7 +30,7 @@ static void sub_080669DC(Entity* this) { sVar1 = 2; } else { if (this->subtimer == 0) { - this->subtimer = 0x10; + this->subtimer = 16; } else { this->subtimer = this->subtimer - 1; sVar1 = this->animIndex; diff --git a/src/npc/rem.c b/src/npc/rem.c index 00a9ec5e..e4fa2363 100644 --- a/src/npc/rem.c +++ b/src/npc/rem.c @@ -57,7 +57,7 @@ void sub_0806a370(Entity* this) { void sub_0806A3D8(Entity* this) { this->action = 1; - this->timer = 0xb4; + this->timer = 180; SetDefaultPriority(this, PRIO_MESSAGE); sub_0806A8C8(this); *(ScriptExecutionContext**)&this->cutsceneBeh = StartCutscene(this, &script_Rem); @@ -126,7 +126,7 @@ void sub_0806A4CC(Entity* this) { } break; default: - this->timer = 0xb4; + this->timer = 180; break; } } diff --git a/src/npc/smith.c b/src/npc/smith.c index f0de3132..0ff8ef31 100644 --- a/src/npc/smith.c +++ b/src/npc/smith.c @@ -86,7 +86,7 @@ void sub_08066118(Entity* this) { uVar1 = 2; } else { if (this->subtimer == 0) { - this->subtimer = 0x10; + this->subtimer = 16; } else { --this->subtimer; uVar1 = this->animIndex; diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c index b1f4bf79..93c215e4 100644 --- a/src/npc/townsperson.c +++ b/src/npc/townsperson.c @@ -50,7 +50,7 @@ void sub_08061C00(Entity* this) { uVar1 = this->animationState + 4; } else { if (this->subtimer == 0) { - this->subtimer = 0x10; + this->subtimer = 16; } else { this->subtimer--; uVar1 = this->animIndex & 3; diff --git a/src/npc/vaatiReborn.c b/src/npc/vaatiReborn.c index c4b59a64..660d4ee0 100644 --- a/src/npc/vaatiReborn.c +++ b/src/npc/vaatiReborn.c @@ -33,7 +33,7 @@ void VaatiRebornAction0(Entity* this) { case 0: this->y.HALF.HI -= 0xa0; this->timer = 0xa0; - this->subtimer = 0x20; + this->subtimer = 32; this->spriteOffsetY = 0x20; for (i = 0; i < 4; i++) { entity = CreateNPC(VAATI_REBORN, 2, i); @@ -60,7 +60,7 @@ void VaatiRebornAction0(Entity* this) { break; case 3: this->timer = 1; - this->subtimer = 0x20; + this->subtimer = 32; entity = CreateNPC(VAATI_REBORN, 4, 0); if (entity != NULL) { CopyPosition(this, entity); @@ -105,7 +105,7 @@ void VaatiRebornAction1(Entity* this) { return; } if (this->subtimer-- == 1) { - this->subtimer = 0x20; + this->subtimer = 32; SoundReq(SFX_1A9); } UpdateAnimationSingleFrame(this); @@ -161,7 +161,7 @@ void VaatiRebornAction1(Entity* this) { } if (--this->subtimer == 0) { - this->subtimer = 0x20; + this->subtimer = 32; SoundReq(SFX_1A9); } UpdateAnimationSingleFrame(this); diff --git a/src/object/barrelInside.c b/src/object/barrelInside.c index fee1a436..adc437ba 100644 --- a/src/object/barrelInside.c +++ b/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; diff --git a/src/object/beanstalk.c b/src/object/beanstalk.c index 8328945a..07262a6a 100644 --- a/src/object/beanstalk.c +++ b/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); } } diff --git a/src/object/bigVortex.c b/src/object/bigVortex.c index 6b7ef06d..971f7fa7 100644 --- a/src/object/bigVortex.c +++ b/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; diff --git a/src/object/blockPushed.c b/src/object/blockPushed.c index 387518f6..35d9d883 100644 --- a/src/object/blockPushed.c +++ b/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); diff --git a/src/object/button.c b/src/object/button.c index 1429cb05..d4549f1a 100644 --- a/src/object/button.c +++ b/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; diff --git a/src/object/chestSpawner.c b/src/object/chestSpawner.c index c37e7601..6d74cc64 100644 --- a/src/object/chestSpawner.c +++ b/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); diff --git a/src/object/ezloCap.c b/src/object/ezloCap.c index 5fbc1910..1d8c0e88 100644 --- a/src/object/ezloCap.c +++ b/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) { diff --git a/src/object/fairy.c b/src/object/fairy.c index 349fdf68..a5cca8b0 100644 --- a/src/object/fairy.c +++ b/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; diff --git a/src/object/fourElements.c b/src/object/fourElements.c index 3b4b8d97..68d22044 100644 --- a/src/object/fourElements.c +++ b/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); diff --git a/src/object/keyStealingTakkuri.c b/src/object/keyStealingTakkuri.c index 4d7a38e4..919e804f 100644 --- a/src/object/keyStealingTakkuri.c +++ b/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); } diff --git a/src/object/lightableSwitch.c b/src/object/lightableSwitch.c index ae10b872..a49b4b37 100644 --- a/src/object/lightableSwitch.c +++ b/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); diff --git a/src/object/macroMushroomStalks.c b/src/object/macroMushroomStalks.c index 4bc6b577..de334eb6 100644 --- a/src/object/macroMushroomStalks.c +++ b/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); } diff --git a/src/object/macroPlayer.c b/src/object/macroPlayer.c index 603251e6..690196b1 100644 --- a/src/object/macroPlayer.c +++ b/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; } } diff --git a/src/object/minishLight.c b/src/object/minishLight.c index 361e6768..c6a81f90 100644 --- a/src/object/minishLight.c +++ b/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) { diff --git a/src/object/object35.c b/src/object/object35.c index 17d9733d..29ffef83 100644 --- a/src/object/object35.c +++ b/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; diff --git a/src/object/object8E.c b/src/object/object8E.c index 4cbb6934..06d0df7a 100644 --- a/src/object/object8E.c +++ b/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) { diff --git a/src/object/objectA8.c b/src/object/objectA8.c index 98baa343..1dbc7af2 100644 --- a/src/object/objectA8.c +++ b/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; diff --git a/src/object/objectB2.c b/src/object/objectB2.c index 7cbff895..ceefcfac 100644 --- a/src/object/objectB2.c +++ b/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; diff --git a/src/object/objectBlockingStairs.c b/src/object/objectBlockingStairs.c index 9101022c..68d1692c 100644 --- a/src/object/objectBlockingStairs.c +++ b/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); } diff --git a/src/object/pullableLever.c b/src/object/pullableLever.c index e3c762e4..59bdfc9a 100644 --- a/src/object/pullableLever.c +++ b/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); } } diff --git a/src/object/pushableFurniture.c b/src/object/pushableFurniture.c index c7f05ffe..5bc5e21d 100644 --- a/src/object/pushableFurniture.c +++ b/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); diff --git a/src/object/pushableGrave.c b/src/object/pushableGrave.c index aa854b9c..49081cd4 100644 --- a/src/object/pushableGrave.c +++ b/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; diff --git a/src/object/smallIceBlock.c b/src/object/smallIceBlock.c index 7bac6c71..1a771c05 100644 --- a/src/object/smallIceBlock.c +++ b/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); diff --git a/src/object/thoughtBubble.c b/src/object/thoughtBubble.c index eb3bf5e6..9916dbc3 100644 --- a/src/object/thoughtBubble.c +++ b/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); diff --git a/src/playerItem/playerItemBomb.c b/src/playerItem/playerItemBomb.c index 717f968f..ca56cc2e 100644 --- a/src/playerItem/playerItemBomb.c +++ b/src/playerItem/playerItemBomb.c @@ -86,7 +86,7 @@ void sub_0801B250(PlayerItemBombEntity* this) { super->timer = 0x0f; super->type = 0xff; } else { - super->timer = 0x96; + super->timer = 150; } super->hitbox = (Hitbox*)&gUnk_080B77F4; super->carryFlags = 0; diff --git a/src/projectile/arrowProjectile.c b/src/projectile/arrowProjectile.c index a90e3016..d01c4309 100644 --- a/src/projectile/arrowProjectile.c +++ b/src/projectile/arrowProjectile.c @@ -70,7 +70,7 @@ void ArrowProjectile_Action2(Entity* this) { if (this->collisions != COL_NONE) { this->action = 3; COLLISION_OFF(this); - this->timer = 0x20; + this->timer = 32; InitializeAnimation(this, this->animIndex + 2); EnqueueSFX(SFX_18A); LinearMoveUpdate(this); diff --git a/src/projectile/dekuSeedProjectile.c b/src/projectile/dekuSeedProjectile.c index f4ca7fbf..797de83c 100644 --- a/src/projectile/dekuSeedProjectile.c +++ b/src/projectile/dekuSeedProjectile.c @@ -36,7 +36,7 @@ void sub_080A8470(Entity* this) { void DekuSeedProjectile_Init(Entity* this) { this->action = 1; - this->timer = 0x30; + this->timer = 48; this->subtimer = 0; this->z.HALF.HI -= 4; if (CheckGlobalFlag(TABIDACHI) == 0) { diff --git a/src/projectile/lakituLightning.c b/src/projectile/lakituLightning.c index 6e1e93f7..e89834a9 100644 --- a/src/projectile/lakituLightning.c +++ b/src/projectile/lakituLightning.c @@ -25,7 +25,7 @@ void sub_080A9DD8(Entity* this) { void LakituLightning_Init(Entity* this) { this->action = 1; - this->timer = 0xb4; + this->timer = 180; this->health = 1; InitializeAnimation(this, 0); } diff --git a/src/projectile/mandiblesProjectile.c b/src/projectile/mandiblesProjectile.c index 622b8404..976c096b 100644 --- a/src/projectile/mandiblesProjectile.c +++ b/src/projectile/mandiblesProjectile.c @@ -53,7 +53,7 @@ void sub_080A9EBC(Entity* this) { this->field_0x82.HALF.LO = 2; this->animationState = 0xff; sub_080AA270(this); - this->subtimer = 0x20; + this->subtimer = 32; } break; default: @@ -134,7 +134,7 @@ void MandiblesProjectile_Action3(Entity* this) { if ((this->frame & ANIM_DONE) != 0) { this->action = 4; this->field_0x82.HALF.LO = 3; - this->subtimer = 0x40; + this->subtimer = 64; uVar1 = entity->animationState; this->direction = uVar1 << 2; this->animationState = uVar1 << 0x1a >> 0x1a; @@ -280,7 +280,7 @@ void sub_080AA320(Entity* this) { this->field_0x82.HALF.LO = 1; this->subtimer = 0; parent->action = 2; - parent->subtimer = 0x30; + parent->subtimer = 48; parent->field_0x80.HWORD = 0x50; parent->speed = 0; parent->direction = sub_08049F84(parent, 0); diff --git a/src/projectile/octorokBossProjectile.c b/src/projectile/octorokBossProjectile.c index d338e65c..6645191b 100644 --- a/src/projectile/octorokBossProjectile.c +++ b/src/projectile/octorokBossProjectile.c @@ -58,7 +58,7 @@ void OctorokBossProjectile_Init(Entity* this) { this->direction = this->direction - (Random() & 7); } this->speed = 0x200; - this->timer = 0x30; + this->timer = 48; LinearMoveAngle(this, 0x5000, this->direction); InitializeAnimation(this, 5); break; diff --git a/src/projectile/rockProjectile.c b/src/projectile/rockProjectile.c index 9b82fc4b..3124605a 100644 --- a/src/projectile/rockProjectile.c +++ b/src/projectile/rockProjectile.c @@ -26,7 +26,7 @@ void sub_080A8064(Entity* this) { void RockProjectile_Init(Entity* this) { this->action = 1; - this->timer = 0x30; + this->timer = 48; this->zVelocity = Q_16_16(0.625); InitializeAnimation(this, 0); } diff --git a/src/projectile/v3ElectricProjectile.c b/src/projectile/v3ElectricProjectile.c index f360afa5..c1b42c32 100644 --- a/src/projectile/v3ElectricProjectile.c +++ b/src/projectile/v3ElectricProjectile.c @@ -82,7 +82,7 @@ void V3ElectricProjectile_Action1(Entity* this) { SoundReq(SFX_193); } else { this->action = 3; - this->timer = 0x10; + this->timer = 16; } this->z.HALF.HI -= 0x28; } @@ -146,7 +146,7 @@ void sub_080AC200(Entity* this) { if (--this->timer) return; - this->timer = 0x10; + this->timer = 16; proj = CreateProjectile(V3_ELECTRIC_PROJECTILE); if (proj) { diff --git a/src/subtask.c b/src/subtask.c index ecc923fd..9e5130f6 100644 --- a/src/subtask.c +++ b/src/subtask.c @@ -199,7 +199,7 @@ void sub_08054E1C(void) { void sub_08054E5C(void) { if ((gFadeControl.active == 0) && CheckRoomFlag(0xff)) { gMenu.overlayType++; - gMenu.transitionTimer = 0xb4; + gMenu.transitionTimer = 180; SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 0x10); sub_080553E0(gMenu.field_0x4); sub_0801876C(gMenu.field_0x4, 1); @@ -492,7 +492,7 @@ void sub_08055548(void) { sub_0801876C(gMenu.field_0x4, 1); sub_080553E0(gMenu.field_0x4); gMenu.overlayType++; - gMenu.transitionTimer = 0xb4; + gMenu.transitionTimer = 180; } } |