diff --git a/src/enemy/armos.c b/src/enemy/armos.c index 169a697e..709f0630 100644 --- a/src/enemy/armos.c +++ b/src/enemy/armos.c @@ -367,7 +367,7 @@ void sub_080306C4(ArmosEntity* this) { if (sub_08049FDC(super, 1) && this->unk_7a != 0) { - super->timer = 0x18; + super->timer = 24; uVar3 = sub_0800132C(super, gUnk_020000B0); if (uVar3 != 0xff) { var = 0; @@ -390,7 +390,7 @@ void sub_080306C4(ArmosEntity* this) { } } else { super->action = 4; - super->timer = 0x78; + super->timer = 120; super->speed = 0xa0; } } diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c index 22dd6b43..8583b78d 100644 --- a/src/enemy/bombPeahat.c +++ b/src/enemy/bombPeahat.c @@ -566,7 +566,7 @@ void sub_0802B048(Entity* this) { if (action != 4 && this->field_0x80.HALF.LO) { if (this->timer != 0) { if (--this->timer == 0) { - this->subtimer = 0x50; + this->subtimer = 80; this->field_0x82.HWORD = 0; this->spriteRendering.b0 = 3; SetAffineInfo(this, 0x100, 0x100, 0); @@ -605,7 +605,7 @@ void sub_0802B048(Entity* this) { void sub_0802B1A0(Entity* this) { this->action = 1; this->timer = 0; - this->subtimer = 0x4f; + this->subtimer = 79; this->field_0x80.HALF.HI = 1; InitializeAnimation(this, 0); } diff --git a/src/enemy/bowMoblin.c b/src/enemy/bowMoblin.c index 683a31a3..831477de 100644 --- a/src/enemy/bowMoblin.c +++ b/src/enemy/bowMoblin.c @@ -225,7 +225,7 @@ void sub_0803C400(BowMoblinEntity* this) { break; case 24: super->timer = 0; - super->subtimer = 0x20; + super->subtimer = 32; break; } diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c index 475692e4..9084508b 100644 --- a/src/enemy/businessScrub.c +++ b/src/enemy/businessScrub.c @@ -132,7 +132,7 @@ void sub_08028A74(Entity* this) { if (sub_08028FDC(this)) { sub_080290E0(this, 1); } - this->subtimer = 0x10; + this->subtimer = 16; } break; case 2: diff --git a/src/enemy/gleerok.c b/src/enemy/gleerok.c index 42017571..3b859b52 100644 --- a/src/enemy/gleerok.c +++ b/src/enemy/gleerok.c @@ -80,7 +80,7 @@ void Gleerok_OnDeath(GleerokEntity* this) { if (super->type2 == 0) { super->type2 = 1; super->timer = 0; - super->subtimer = 0x3c; + super->subtimer = 60; this->unk_74 = 0x10; this->unk_75 = 0; gScreen.controls.alphaBlend = this->unk_74; diff --git a/src/enemy/gyorgFemale.c b/src/enemy/gyorgFemale.c index a5948446..8b5dc2a0 100644 --- a/src/enemy/gyorgFemale.c +++ b/src/enemy/gyorgFemale.c @@ -84,7 +84,7 @@ void GyorgFemale_Setup(GyorgFemaleEntity* this) { super->collisionLayer = 2; this->eyesVulnerable = 0; this->unk_79 = 0; - this->childrenSpawnTimer = 0x3C; + this->childrenSpawnTimer = 60; MemClear(&gMapDataBottomSpecial, 0x8000); MemClear(&gMapDataTopSpecial, 0x8000); sub_0804660C(this, 0); @@ -116,13 +116,13 @@ void GyorgFemale_Action1(GyorgFemaleEntity* this) { this->eyeTimer = 0; this->eyesHitFrame = 0; this->eyesHit = 0; - this->childrenSpawnTimer = 0x3c; + this->childrenSpawnTimer = 60; this->unk_80 = 0; return; } if (((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x40) { super->action = 3; - this->childrenSpawnTimer = 0x3c; + this->childrenSpawnTimer = 60; super->timer = 0; this->eyeTimer = 0; this->eyesHitFrame = 0; @@ -165,7 +165,7 @@ void GyorgFemale_Action2(GyorgFemaleEntity* this) { } if ((((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x38) == 0) { super->action = 1; - this->childrenSpawnTimer = 0x3c; + this->childrenSpawnTimer = 60; #ifndef EU this->eyesVulnerable = 0; #endif @@ -203,7 +203,7 @@ void GyorgFemale_Action3(GyorgFemaleEntity* this) { #ifdef EU this->eyesVulnerable = 0; #endif - this->childrenSpawnTimer = 0x3c; + this->childrenSpawnTimer = 60; #ifndef EU this->eyesVulnerable = 0; #endif diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c index 0fcb8e45..6a1dbdcb 100644 --- a/src/enemy/keaton.c +++ b/src/enemy/keaton.c @@ -104,7 +104,7 @@ void sub_080324FC(Entity* this) { if (this->timer != 0) { this->timer--; if (this->timer == 0) { - this->subtimer = 0x1E; + this->subtimer = 30; this->animationState = this->direction / 8; InitAnimationForceUpdate(this, this->animationState + 4); } else { diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c index 6fc94acb..e6cf088c 100644 --- a/src/enemy/mazaalBracelet.c +++ b/src/enemy/mazaalBracelet.c @@ -1306,7 +1306,7 @@ void sub_0803B978(Entity* this) { case 1: this->subAction = 2; this->timer = 2; - this->subtimer = 0x1e; + this->subtimer = 30; this->field_0x74.HALF.LO = 0; SoundReq(SFX_1A9); case 2: diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c index 97b2becb..fe3b6a19 100644 --- a/src/enemy/octorokBoss.c +++ b/src/enemy/octorokBoss.c @@ -141,13 +141,13 @@ void OctorokBoss_Hit_SubAction0(OctorokBossEntity* this) { } else { if (IS_FROZEN(this) == FALSE) { super->type2 = 0; - this->timer = 0x3c; + this->timer = 60; } else { if (this->heap->tailCount > 3) { this->heap->tailCount--; } this->heap->tailObjects[0]->currentAttack = 0; - this->timer = 0x78; + this->timer = 120; } super->subAction = 1; } @@ -258,7 +258,7 @@ void OctorokBoss_Hit_SubAction4(OctorokBossEntity* this) { void OctorokBoss_Hit_SubAction5(OctorokBossEntity* this) { super->subAction = 6; - this->timer = 0x78; + this->timer = 120; this->unk_80 = 0; this->angularSpeed.HALF.LO = 0; } @@ -343,7 +343,7 @@ void OctorokBoss_Intro_SubAction0(OctorokBossEntity* this) { void OctorokBoss_Intro_SubAction1(OctorokBossEntity* this) { // Rotate Octorok to player if (this->angle.HALF.HI == 0x80) { - this->timer = 0x3c; + this->timer = 60; super->subAction = 2; this->heap->unk_0 = 0; // Octorok scream @@ -358,7 +358,7 @@ void OctorokBoss_Intro_SubAction2(OctorokBossEntity* this) { // Wait for scream end if (this->timer-- == 0) { super->subAction = 3; - this->timer = 0x3c; + this->timer = 60; gPlayerEntity.spriteSettings.draw |= 1; gRoomControls.camera_target = &gPlayerEntity; gRoomControls.unk5 = 1; @@ -372,7 +372,7 @@ void OctorokBoss_Intro_SubAction3(OctorokBossEntity* this) { gPlayerEntity.direction = 0x10; gPlayerEntity.animationState = 4; sub_08078AC0(0x1e, 0, 0); - this->timer = 0x3c; + this->timer = 60; super->subAction = 4; } } @@ -708,9 +708,9 @@ void OctorokBoss_Action1_Attack_Type2_1(OctorokBossEntity* this) { if (this->currentAttack == ATTACK_VACUUM) { super->type2 = 3; if (IS_FROZEN(this)) { - this->timer = 0x3c; + this->timer = 60; } else { - this->timer = 0x78; + this->timer = 120; } this->heap->targetAngle = this->angle.HALF.HI; } else { @@ -731,7 +731,7 @@ void OctorokBoss_Action1_Attack_Type2_2(OctorokBossEntity* this) { super->type2 = 3; this->unk_74 = this->unk_76; if (this->currentAttack != ATTACK_SMOKE) { - this->timer = 0x3c; + this->timer = 60; } else { this->timer = 0; CreateObjectWithParent(super, OCTOROK_BOSS_OBJECT, 4, 0); @@ -864,7 +864,7 @@ void OctorokBoss_ExecuteAttackSmoke(OctorokBossEntity* this) { if (this->timer == 0xff) { super->type2 = 0; OctorokBoss_SetAttackTimer(this); - this->timer = 0x78; + this->timer = 120; } else { this->timer++; ChangeLightLevel(-1); @@ -915,7 +915,7 @@ void OctorokBoss_Burning_SubAction0(OctorokBossEntity* this) { super->speed = 0x200; super->collisions = COL_NONE; super->direction = (u8)(-this->angle.HALF.HI ^ 0x80U) >> 3; - this->timer = 0x78; + this->timer = 120; this->angularSpeed.HWORD = 0x180; this->heap->unk_0 = 4; sub_080368D8(this); @@ -1162,7 +1162,7 @@ void OctorokBoss_StartRegularAttack(OctorokBossEntity* this) { if (((Random() & 3) == 0) || ((s16)gRoomVars.lightLevel != 0x100)) { super->subAction = ACTION1_SUBACTION2; super->speed = 0x200; - this->timer = 0x3c; + this->timer = 60; super->collisions = COL_NONE; this->heap->unk_0 = 4; SoundReq(SFX_159); @@ -1217,7 +1217,7 @@ void sub_08036F60(OctorokBossEntity* this) { super->timer = 1; } else { if (this->unk_76 > 0xa4) { - super->timer = 0xff; + super->timer = 255; } } } diff --git a/src/enemy/octorokGolden.c b/src/enemy/octorokGolden.c index bf810cda..8cf3dff4 100644 --- a/src/enemy/octorokGolden.c +++ b/src/enemy/octorokGolden.c @@ -91,7 +91,7 @@ static void sub_08037D54(Entity* this) { } else if (this->frame & ANIM_DONE) { if (--this->timer == 0) { this->action = 1; - this->subtimer = 0x3c; + this->subtimer = 60; this->animationState |= 0xff; sub_08037E14(this); } else { diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c index ae2d6bbe..dfa5ab20 100644 --- a/src/enemy/puffstool.c +++ b/src/enemy/puffstool.c @@ -69,7 +69,7 @@ void Puffstool_OnCollide(Entity* this) { ChangeObjPalette(this, 0x7c); } this->action = 7; - this->timer = 0x3c; + this->timer = 60; if (0 < this->zVelocity) { this->zVelocity = 0; } @@ -196,7 +196,7 @@ void sub_080252E0(Entity* this) { if (this->x.HALF.HI == (u16)this->field_0x7c.HALF.LO && this->y.HALF.HI == (u16)this->field_0x7c.HALF.HI) { this->action = 3; - this->timer = 0x1e; + this->timer = 30; this->subtimer = 0; this->zVelocity = Q_16_16(1.5); InitializeAnimation(this, 1); @@ -227,7 +227,7 @@ void sub_080253D4(Entity* this) { InitializeAnimation(this, 3); } else { this->action = 6; - this->timer = 0x1e; + this->timer = 30; InitializeAnimation(this, 3); sub_08025A54(this); sub_08025AE8(this); @@ -378,7 +378,7 @@ void sub_0802563C(Entity* this) { void sub_080256B4(Entity* this) { this->action = 1; this->timer = (Random() & 3) + 4; - this->subtimer = 0x1e; + this->subtimer = 30; this->direction = (this->direction + 7 + ((s32)Random() % 7) * 4) & 0x1c; this->field_0x78.HWORD = gUnk_080CC000[Random() & 0xf]; this->field_0x7a.HALF.LO = ((s32)Random() % 0x18) << 1; diff --git a/src/enemy/rope.c b/src/enemy/rope.c index 1f618453..f8a66318 100644 --- a/src/enemy/rope.c +++ b/src/enemy/rope.c @@ -45,7 +45,7 @@ void Rope_OnTick(Entity* this) { void Rope_OnCollision(Entity* this) { if (this->action == 3) { - this->subtimer = 0x1e; + this->subtimer = 30; this->field_0x78.HALF.LO = 0x3c; sub_08031600(this); } diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c index ab1d8442..c9e4833f 100644 --- a/src/enemy/rupeeLike.c +++ b/src/enemy/rupeeLike.c @@ -246,7 +246,7 @@ void sub_080296D8(Entity* this) { gPlayerEntity.spriteOffsetY = 0; gPlayerEntity.speed = 0x140; this->action = 5; - this->subtimer = 0x3c; + this->subtimer = 60; this->flags2 |= 3; if ((s8)this->iframes == 0) { this->iframes = 0xf4; diff --git a/src/enemy/spark.c b/src/enemy/spark.c index 8eaeac39..26ea7c79 100644 --- a/src/enemy/spark.c +++ b/src/enemy/spark.c @@ -46,7 +46,7 @@ void sub_0802B33C(Entity* this) { sub_0804A720(this); this->action = 1; this->direction = this->type2; - this->subtimer = 0x78; + this->subtimer = 120; InitializeAnimation(this, 0); } @@ -58,13 +58,13 @@ void sub_0802B35C(Entity* this) { is_head = this->type == 0; if (this->collisions == COL_NONE) { if (--this->subtimer == 0) { - this->subtimer = 0x78; + this->subtimer = 120; this->direction += is_head ? 0x08 : 0x18; this->direction = DirectionRound(this->direction); } } else { - this->subtimer = 0x78; + this->subtimer = 120; switch (DirectionRound(this->direction)) { case DirectionNorth: if ((this->collisions & COL_NORTH_ANY) != COL_NONE) { diff --git a/src/enemy/spearMoblin.c b/src/enemy/spearMoblin.c index 1c4a1971..58c92d23 100644 --- a/src/enemy/spearMoblin.c +++ b/src/enemy/spearMoblin.c @@ -87,7 +87,7 @@ void sub_08028314(Entity* this) { if (this->timer) { this->animationState = this->type2 << 1; - this->timer = 0x1e; + this->timer = 30; this->speed = 0x80; this->direction = this->animationState << 2; sub_080287E0(this); diff --git a/src/enemy/spikedBeetle.c b/src/enemy/spikedBeetle.c index 2e4884ce..5e796cb3 100644 --- a/src/enemy/spikedBeetle.c +++ b/src/enemy/spikedBeetle.c @@ -86,13 +86,13 @@ void sub_0802B744(Entity* this) { GetNextFrame(this); if (sub_08049FDC(this, 1) && (direction = sub_0804A024(this, 1, 0xc), direction != 0xff)) { this->action = 3; - this->timer = 0x1e; + this->timer = 30; this->direction = DirectionRound(direction); InitializeAnimation(this, 8); } else { if (--this->timer == 0) { this->action = 2; - this->timer = 0x1e; + this->timer = 30; } else { if (!ProcessMovement0(this)) { this->timer = 1; @@ -121,7 +121,7 @@ void sub_0802B7FC(Entity* this) { GetNextFrame(this); if (--this->timer == 0) { this->action = 4; - this->timer = 0x78; + this->timer = 120; this->speed = 0x1c0; } } @@ -145,7 +145,7 @@ void sub_0802B820(Entity* this) { void sub_0802B880(Entity* this) { if (--this->timer == 0) { this->action = 2; - this->timer = 0x3c; + this->timer = 60; this->animationState = DirectionToAnimationState(this->direction); InitializeAnimation(this, this->animationState); } @@ -204,7 +204,7 @@ void sub_0802B960(Entity* this) { void sub_0802B9B4(Entity* this) { this->action = 5; - this->timer = 0x3c; + this->timer = 60; this->animationState = (this->direction >> 3) & 3; InitializeAnimation(this, this->animationState + 4); } diff --git a/src/enemy/spinyBeetle.c b/src/enemy/spinyBeetle.c index d1a3e8ca..2b305415 100644 --- a/src/enemy/spinyBeetle.c +++ b/src/enemy/spinyBeetle.c @@ -175,7 +175,7 @@ void sub_08033A7C(SpinyBeetleEntity* this) { return; super->action = 3; - super->timer = 0x78; + super->timer = 120; super->subtimer = 0x20; super->spritePriority.b1 = 1; InitializeAnimation(super, 3); @@ -197,7 +197,7 @@ void sub_08033ACC(SpinyBeetleEntity* this) { if (--super->timer == 0) { super->action = 4; - super->timer = 0x78; + super->timer = 120; super->x.WORD = (super->x.WORD & 0xfff00000) | 0x80000; super->y.WORD = (super->y.WORD & 0xfff00000) | 0xC0000; this->unk_7c = super->x.WORD; @@ -270,7 +270,7 @@ void sub_08033C94(SpinyBeetleEntity* this) { if (--super->timer) return; this->unk_79 = 2; - super->timer = 0x78; + super->timer = 120; super->spriteOffsetY = 0; super->direction = sub_08049F84(super, 1) + 0x14; diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c index 9cb2653d..157a9bef 100644 --- a/src/enemy/spinyChuchu.c +++ b/src/enemy/spinyChuchu.c @@ -35,7 +35,7 @@ void SpinyChuchu_OnCollision(Entity* this) { case 2: case 3: this->action = 2; - this->subtimer = 0x3c; + this->subtimer = 60; this->hitType = 0x5c; this->hitbox = (Hitbox*)&gHitbox_23; InitializeAnimation(this, 0); @@ -106,7 +106,7 @@ void sub_080225EC(Entity* this) { InitializeAnimation(this, 0); } else { this->action = 1; - this->subtimer = 0x3c; + this->subtimer = 60; this->spriteSettings.draw = 3; this->spriteRendering.b3 = 1; this->spriteOrientation.flipY = 1; diff --git a/src/enemy/stalfos.c b/src/enemy/stalfos.c index 457d7c59..e58091d3 100644 --- a/src/enemy/stalfos.c +++ b/src/enemy/stalfos.c @@ -303,7 +303,7 @@ bool32 sub_08039758(StalfosEntity* this) { } else { if (EntityWithinDistance(super, gUnk_020000B0->x.HALF.HI, gUnk_020000B0->y.HALF.HI, 0x48)) { super->action = 8; - super->timer = 0x3c; + super->timer = 60; super->direction = GetFacingDirection(super, gUnk_020000B0); InitAnimationForceUpdate(super, super->animationState + 0xc); return TRUE; diff --git a/src/enemy/vaatiArm.c b/src/enemy/vaatiArm.c index 912e48cc..c1546fca 100644 --- a/src/enemy/vaatiArm.c +++ b/src/enemy/vaatiArm.c @@ -338,7 +338,7 @@ static void sub_080428AC(Entity* this) { pVVar3->unk00.HWORD += pVVar3->unk08; } else { this->subAction = 2; - this->timer = 0x1e; + this->timer = 30; } sub_08043BF0(this); } @@ -383,7 +383,7 @@ static void sub_08042970(Entity* this) { pVVar3->unk00.HWORD += pVVar3->unk08; } else { this->subAction = 5; - this->timer = 0x3c; + this->timer = 60; uVar2 = 0; do { ((VaatiArm_HeapStruct*)this->myHeap)->entities[uVar2]->hitType = 0x39; @@ -451,7 +451,7 @@ static void sub_08042A88(Entity* this) { pVVar4->unk04.HWORD = 0; pVVar4->unk08 = gUnk_080D12CA[this->type2]; this->subAction = 2; - this->timer = 0x1e; + this->timer = 30; } } @@ -506,7 +506,7 @@ static void sub_08042B20(Entity* this) { if (--this->timer == 0) { this->action = 5; this->subAction = 0; - this->timer = 0x1e; + this->timer = 30; this->hitType = 0x39; ((VaatiArm_HeapStruct*)this->myHeap)->entities[1]->hitType = 0x39; } @@ -529,7 +529,7 @@ static void sub_08042C34(Entity* this) { VaatiArm_HeapStruct1* ptr; if (--this->timer == 0) { - this->timer = 0x3c; + this->timer = 60; this->subtimer = 3; this->subAction = 1; random = Random() & 6; @@ -615,7 +615,7 @@ static void sub_08042D6C(Entity* this) { ((VaatiArm_HeapStruct*)this->myHeap)->s1[0].unk08 = gUnk_080D1300[this->type2]; ((VaatiArm_HeapStruct*)this->myHeap)->s1[0].unk0a = 0xc0; this->subAction = 3; - this->timer = 0x1e; + this->timer = 30; this->hitType = 0x39; this->field_0x7c.BYTES.byte3 = 0x2d; InitAnimationForceUpdate(this, 0); @@ -719,10 +719,10 @@ static void sub_08042FD8(Entity* this) { if (this->frame & ANIM_DONE) { if (--this->subtimer == 0) { this->subAction = 8; - this->timer = 0x3c; + this->timer = 60; } else { this->subAction = 3; - this->timer = 0x3c; + this->timer = 60; InitAnimationForceUpdate(this, 0); } } @@ -767,10 +767,10 @@ static void sub_080430D0(Entity* this) { if (ptr[0].unk04.HALF.HI < 0x18) { if (--this->subtimer == 0) { this->subAction = 8; - this->timer = 0x3c; + this->timer = 60; } else { this->subAction = 3; - this->timer = 0x3c; + this->timer = 60; ptr[0].unk0a = -0xc0; InitAnimationForceUpdate(this, 0); } @@ -813,7 +813,7 @@ static void sub_08043130(Entity* this) { } if (this->spriteSettings.draw == 0) { this->subAction = 9; - this->timer = 0x3c; + this->timer = 60; sub_0804AA1C(this); } } @@ -1007,7 +1007,7 @@ static void sub_08043580(Entity* this) { } if ((this->spriteSettings.draw & 3) == 0) { this->subAction = 5; - this->timer = 0x3c; + this->timer = 60; entity = ((VaatiArm_HeapStruct*)this->myHeap)->entities[4]; entity->collisionFlags = entity->collisionFlags | 0x10; entity->hitType = 0x39; @@ -1050,7 +1050,7 @@ static void sub_08043698(Entity* this) { u32 i; this->subAction = 1; - this->timer = 0x3c; + this->timer = 60; for (i = 0; i < 5; i++) { entity = ((VaatiArm_HeapStruct*)this->myHeap)->entities[i]; entity->flags = entity->flags & ~ENT_COLLIDE; diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c index fa73d108..69b92375 100644 --- a/src/enemy/vaatiWrath.c +++ b/src/enemy/vaatiWrath.c @@ -134,7 +134,7 @@ void VaatiWrathType0Action0(Entity* this) { this->subAction = 1; } else { this->action = 2; - this->timer = 0x3c; + this->timer = 60; } this->x.HALF.HI = gRoomTransition.hurtType; this->y.HALF.HI = gRoomTransition.field_0x42; @@ -185,7 +185,7 @@ void VaatiWrathType0Action1(Entity* this) { return; } this->subAction = 3; - this->timer = 0x3c; + this->timer = 60; } break; case 3: @@ -215,7 +215,7 @@ void VaatiWrathType0Action1(Entity* this) { case 5: sub_08042004(this); this->subAction = 6; - this->timer = 0x1e; + this->timer = 30; gRoomTransition.field_0x38 |= 1; gRoomControls.camera_target = &gPlayerEntity; gPlayerState.controlMode = CONTROL_1; @@ -226,7 +226,7 @@ void VaatiWrathType0Action1(Entity* this) { return; } this->action = 2; - this->timer = 0x3c; + this->timer = 60; break; } } @@ -333,13 +333,13 @@ void VaatiWrathType0Action5(Entity* this) { ((VaatiWrathHeapStruct*)this->myHeap)->object5b = object; gRoomControls.camera_target = object; this->action = 6; - this->timer = 0x1e; + this->timer = 30; ((VaatiWrathHeapStruct*)this->myHeap)->type1->subAction = 1; InitializeAnimation(((VaatiWrathHeapStruct*)this->myHeap)->type1, 0xe); } } else { this->action = 2; - this->timer = 0x3c; + this->timer = 60; } } } @@ -403,7 +403,7 @@ void VaatiWrathType0Action8(Entity* this) { } if (--this->timer == 0) { this->action = 9; - this->timer = 0x3c; + this->timer = 60; } else { if (this->timer < 0x1e) { this->speed -= 0xc; @@ -431,7 +431,7 @@ void VaatiWrathType0Action9(Entity* this) { ((VaatiWrathHeapStruct*)this->myHeap)->eyes[3]->timer = 1; } else { this->action = 7; - this->timer = 0x1e; + this->timer = 30; this->field_0x78.HALF.HI = 0; } } @@ -488,7 +488,7 @@ void VaatiWrathType0ActionB(Entity* this) { GetNextFrame(((VaatiWrathHeapStruct*)this->myHeap)->type2); if (--this->timer == 0) { this->subAction = 2; - this->timer = 0x3c; + this->timer = 60; this->hitType = 0x39; this->health = 0xff; } @@ -622,7 +622,7 @@ void sub_08041CD0(Entity* this) { this->timer--; } else { this->subAction = 2; - this->timer = 0x3c; + this->timer = 60; MessageFromTarget(TEXT_INDEX(TEXT_VAATI2, 0x51)); } } else { diff --git a/src/enemy/vaatiWrathEye.c b/src/enemy/vaatiWrathEye.c index c5d0a044..3bc64342 100644 --- a/src/enemy/vaatiWrathEye.c +++ b/src/enemy/vaatiWrathEye.c @@ -92,7 +92,7 @@ void VaatiWrathEyeAction3(Entity* this) { this->z.HALF.HI = this->parent->z.HALF.HI; if ((this->x.HALF.HI == x) && (this->y.HALF.HI == y)) { this->action = 4; - this->timer = 0x3c; + this->timer = 60; } } } @@ -118,7 +118,7 @@ void VaatiWrathEyeAction5(Entity* this) { if (this->parent->health >= 0x15) { this->timer = 120; } else { - this->timer = 0x3c; + this->timer = 60; } this->child = NULL; InitializeAnimation(this, 5); @@ -160,7 +160,7 @@ void VaatiWrathEyeAction7(Entity* this) { GetNextFrame(this); if (this->subtimer != 0) { this->action = 8; - this->timer = 0x3c; + this->timer = 60; COLLISION_OFF(this); this->spriteSettings.draw = 0; CreateFx(this, FX_REFLECT2, 0x40); @@ -177,7 +177,7 @@ void VaatiWrathEyeAction7(Entity* this) { void VaatiWrathEyeAction8(Entity* this) { if (this->parent->action == 0xb) { - this->timer = 0x3c; + this->timer = 60; } else { if (--this->timer == 0) { this->action = 9; diff --git a/src/enemy/wallMaster.c b/src/enemy/wallMaster.c index 709f2939..85942393 100644 --- a/src/enemy/wallMaster.c +++ b/src/enemy/wallMaster.c @@ -115,7 +115,7 @@ void sub_0802A610(Entity* this) { flags = this->frame & ANIM_DONE; if (flags) { this->action = 4; - this->timer = 0x1e; + this->timer = 30; } else if (this->frame & 1) { this->frame = flags; this->hitType = 0x75; @@ -157,7 +157,7 @@ void sub_0802A69C(Entity* this) { flags = this->frame & ANIM_DONE; if (flags) { this->action = 6; - this->timer = 0x1e; + this->timer = 30; } else if (this->frame & 0x1) { this->frame = flags; this->spriteOffsetY = 3; diff --git a/src/enemyUtils.c b/src/enemyUtils.c index 1c2c8484..ae4f3462 100644 --- a/src/enemyUtils.c +++ b/src/enemyUtils.c @@ -130,7 +130,7 @@ void CreateDeathFx(GenericEntity* parent, u32 parentId, u32 fixedItem) { sub_08049CF4(&(parent->base)); gSave.unk50 += 1; parent->base.gustJarState |= 2; - parent->base.timer = 0xff; + parent->base.timer = 255; SetDefaultPriority(&(parent->base), 3); deathFx2 = (DeathFxObject*)CreateObject(DEATH_FX, parent->base.id, 0); if (deathFx2 != NULL) { diff --git a/src/fileselect.c b/src/fileselect.c index aacb57f0..38c66ddc 100644 --- a/src/fileselect.c +++ b/src/fileselect.c @@ -632,7 +632,7 @@ void sub_08050C54(void) { if (column_idx == 0) { SoundReq(SONG_VOL_FADE_OUT); } - gMenu.transitionTimer = 0xf; + gMenu.transitionTimer = 15; SetMenuType(1); SoundReq(SFX_TEXTBOX_SELECT); break; @@ -753,7 +753,7 @@ void sub_08050EB8(void) { gMapDataBottomSpecial.unk4 = save->msg_speed; gMapDataBottomSpecial.unk5 = save->brightness; gMenu.column_idx = 0; - gMenu.transitionTimer = 0xff; + gMenu.transitionTimer = 255; SetMenuType(1); } @@ -836,7 +836,7 @@ END_NONMATCH void sub_08050FFC(void) { switch (HandleSave(0)) { case SAVE_ERROR: - gMenu.transitionTimer = 0x1e; + gMenu.transitionTimer = 30; sub_0805194C(gMapDataBottomSpecial.unk6); CreateDialogBox(9, 0); case SAVE_OK: @@ -908,7 +908,7 @@ void sub_080513C0(void) { case -1: sub_0805194C(gMapDataBottomSpecial.unk6); CreateDialogBox(6, 0); - gMenu.transitionTimer = 0x1e; + gMenu.transitionTimer = 30; gMenu.overlayType = 2; break; } @@ -1121,7 +1121,7 @@ void sub_08051738(void) { gGenericMenu.unk10.a[i] = val; } if (uVar3 == 0) { - gMenu.transitionTimer = 0x3c; + gMenu.transitionTimer = 60; CreateDialogBox(1, 0); SetMenuType(3); } else { @@ -1197,7 +1197,7 @@ void sub_08051874(void) { case -1: sub_0805194C(gMapDataBottomSpecial.unk7); CreateDialogBox(3, 0); - gMenu.transitionTimer = 0x1e; + gMenu.transitionTimer = 30; SetMenuType(3); break; } diff --git a/src/game.c b/src/game.c index d68ffc85..94bf542c 100644 --- a/src/game.c +++ b/src/game.c @@ -830,7 +830,7 @@ static void GameOver_TextMove(void) { static void GameOver_Update(void) { switch (gMenu.menuType) { case 0x0: - gMenu.transitionTimer = 0x1e; + gMenu.transitionTimer = 30; gMenu.field_0x3 = 0; SetMenuType(1); SetPopupState(1, 0); @@ -1792,7 +1792,7 @@ void CutsceneMain_Init(void) { void sub_080535AC(void) { gMenu.overlayType = 1; - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; gUI.field_0x6 = 1; gUpdateVisibleTiles = 1; gScreen.lcd.displayControl &= 0xfeff; @@ -1873,7 +1873,7 @@ void sub_0805373C(void) { void sub_08053758(void) { gMenu.overlayType = 1; - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; gMenu.field_0xa = 0x1e; *((u8*)&gMenu + 0x10) = 0; // TODO gUI.field_0x6 = 1; @@ -1987,7 +1987,7 @@ void sub_080539F4(void) { if (gFadeControl.active == 0) { DispReset(1); gMenu.overlayType++; - gMenu.transitionTimer = 0x3c; + gMenu.transitionTimer = 60; } } @@ -2082,7 +2082,7 @@ void sub_08053C04(void) { void sub_08053C20(void) { gMenu.overlayType = 1; - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; gUpdateVisibleTiles = 1; sub_08051FF0(); sub_0805B4D0(4); @@ -2140,7 +2140,7 @@ void sub_08053D34(void) { } } if (gFadeControl.active == 0) { - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; gMenu.overlayType++; } } @@ -2164,7 +2164,7 @@ void sub_08053DB4(void) { LoadRoomEntityList(*(EntityData**)ptr); LoadRoomEntityList((EntityData*)GetRoomProperty(ptr[4], ptr[5], 1)); LoadRoomEntityList((EntityData*)GetRoomProperty(ptr[4], ptr[5], 2)); - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; gMenu.overlayType++; SetFadeInverted(0x10); } @@ -2184,7 +2184,7 @@ void sub_08053E74(void) { const EntityData** ptr = gUnk_080FCFB8; gMenu.field_0xc = (u8*)ptr; LoadRoomEntityList((EntityData*)ptr[0]); - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; gMenu.field_0xa = 0x3c; gMenu.overlayType++; gScreen.lcd.displayControl &= 0xfeff; @@ -2221,7 +2221,7 @@ void sub_08053F20(void) { gRoomControls.scroll_x = (s8)ptr[10] + gRoomControls.scroll_x; gRoomControls.scroll_y = (s8)ptr[0xb] + gRoomControls.scroll_y; LoadRoomEntityList(*(EntityData**)ptr); - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; gMenu.field_0xa = 0x3c; gMenu.overlayType++; SetFadeInverted(8); diff --git a/src/manager/angryStatueManager.c b/src/manager/angryStatueManager.c index 3cbb2b74..d8b0fc9e 100644 --- a/src/manager/angryStatueManager.c +++ b/src/manager/angryStatueManager.c @@ -45,7 +45,7 @@ void AngryStatueManager_Init(AngryStatueManager* this) { objectData += 3; } super->action = 1; - super->subtimer = 0x3c; + super->subtimer = 60; this->field_0x36 = 0; } } diff --git a/src/manager/cameraTargetManager.c b/src/manager/cameraTargetManager.c index 909068ba..dc886926 100644 --- a/src/manager/cameraTargetManager.c +++ b/src/manager/cameraTargetManager.c @@ -42,7 +42,7 @@ void CameraTargetManager_Action1(CameraTargetManager* this) { super->action = 2; super->timer = this->field_0x35; if (super->timer == 0) { - super->timer = 0x1e; + super->timer = 30; } super->parent = gRoomControls.camera_target; object = CreateObject(OBJECT_69, 0, 0); diff --git a/src/manager/enterRoomTextboxManager.c b/src/manager/enterRoomTextboxManager.c index d1a92097..0dcf7c9b 100644 --- a/src/manager/enterRoomTextboxManager.c +++ b/src/manager/enterRoomTextboxManager.c @@ -38,8 +38,8 @@ void sub_0805E140(EnterRoomTextboxManager* this) { super->flags |= ENT_PERSIST; super->action = 1; this->unk_20 = gRoomControls.room; - super->timer = 0x78; - super->subtimer = 0x3c; + super->timer = 120; + super->subtimer = 60; SetDefaultPriority((Entity*)this, PRIO_HIGHEST); sub_0805E1F8(gUnk_08108DE8[gArea.locationIndex], AreaIsDungeon()); } diff --git a/src/manager/floatingPlatformManager.c b/src/manager/floatingPlatformManager.c index f46f5e66..9f42b50e 100644 --- a/src/manager/floatingPlatformManager.c +++ b/src/manager/floatingPlatformManager.c @@ -32,7 +32,7 @@ void FloatingPlatformManager_Init(FloatingPlatformManager* this) { while (*(u8*)entityData != 0xff) { entity = LoadRoomEntity(entityData++); entity->parent = (Entity*)this; - entity->timer = 0xff; + entity->timer = 255; } } diff --git a/src/manager/lightLevelSetManager.c b/src/manager/lightLevelSetManager.c index 8bb54507..c5b9f02d 100644 --- a/src/manager/lightLevelSetManager.c +++ b/src/manager/lightLevelSetManager.c @@ -32,7 +32,7 @@ void LightLevelSetManager_Main(Manager* this) { void LightLevelSetManager_Type0(LightLevelSetManager* this) { if (super->action == 0) { super->action = 1; - super->subtimer = 0x1e; + super->subtimer = 30; if (CheckFlags(this->field_0x3e) != 0) { sub_0805BE94(this); } @@ -47,7 +47,7 @@ void LightLevelSetManager_Type1(LightLevelSetManager* this) { switch (super->action) { case 0: super->action = 1; - super->subtimer = 0x1e; + super->subtimer = 30; if (CheckFlags(this->field_0x3e) != 0) { sub_0805BE70(this, 0x75); super->action = 2; @@ -55,14 +55,14 @@ void LightLevelSetManager_Type1(LightLevelSetManager* this) { break; case 1: if (CheckFlags(this->field_0x3e) != 0 && --super->subtimer == 0) { - super->subtimer = 0x1e; + super->subtimer = 30; sub_0805BEC4(this); sub_0805BE70(this, 0x76); } break; case 2: if (CheckFlags(this->field_0x3e) == 0 && --super->subtimer == 0) { - super->subtimer = 0x1e; + super->subtimer = 30; sub_0805BE70(this, 0x75); } break; diff --git a/src/manager/secretManager.c b/src/manager/secretManager.c index f5b1f281..4a9ba020 100644 --- a/src/manager/secretManager.c +++ b/src/manager/secretManager.c @@ -49,7 +49,7 @@ void SecretManager_Type0_Init(SecretManager* this) { } super->action = 1; if (super->timer == 0) { - super->timer = 0x1e; + super->timer = 30; } SetDefaultPriority((Entity*)this, PRIO_PLAYER_EVENT); } @@ -91,7 +91,7 @@ void SecretManager_Type1_Init(SecretManager* this) { CheckFlags(this->field_0x3e); super->action = 1; if (super->timer == 0) { - super->timer = 0x1e; + super->timer = 30; } super->subtimer = super->timer; SetDefaultPriority((Entity*)this, PRIO_PLAYER_EVENT); diff --git a/src/manager/vaati3StartManager.c b/src/manager/vaati3StartManager.c index c0d4124e..9a5f5290 100644 --- a/src/manager/vaati3StartManager.c +++ b/src/manager/vaati3StartManager.c @@ -69,7 +69,7 @@ void Vaati3StartManager_Type0_Action1(Vaati3StartManager* this) { if (distX * distX + distY * distY < 0x901) { super->action = 2; super->subAction = 0; - super->timer = 0x78; + super->timer = 120; SetPlayerControl(2); sub_08078B48(); object = CreateObject(OBJECT_64, 0, 0); @@ -94,7 +94,7 @@ void Vaati3StartManager_Type0_Action2(Vaati3StartManager* this) { } else { if (--super->timer == 0) { super->action = 3; - super->timer = 0x1e; + super->timer = 30; MessageFromTarget(TEXT_INDEX(TEXT_VAATI2, 0x4f)); } } diff --git a/src/manager/vaatiAppearingManager.c b/src/manager/vaatiAppearingManager.c index 5db57799..fd041722 100644 --- a/src/manager/vaatiAppearingManager.c +++ b/src/manager/vaatiAppearingManager.c @@ -94,7 +94,7 @@ void VaatiAppearingManager_Action1(VaatiAppearingManager* this) { case 3: if (--this->field_0x20 == 0) { super->subAction = 4; - super->timer = 0x3c; + super->timer = 60; } break; default: diff --git a/src/menu/kinstone_menu.c b/src/menu/kinstone_menu.c index c9815810..688b750c 100644 --- a/src/menu/kinstone_menu.c +++ b/src/menu/kinstone_menu.c @@ -313,7 +313,7 @@ void KinstoneMenu_Type5_Overlay0(void) { SoundReq(SFX_TASK_COMPLETE); MessageAtHeight(TEXT_INDEX(TEXT_WINDCRESTS, 0x2), 0xe); gMenu.overlayType = 1; - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; } void KinstoneMenu_Type5_Overlay1(void) { diff --git a/src/npc/bigGoron.c b/src/npc/bigGoron.c index d7c41850..b4c82439 100644 --- a/src/npc/bigGoron.c +++ b/src/npc/bigGoron.c @@ -182,7 +182,7 @@ void sub_0806D1D0(Entity* this) { this->spritePriority.b0 = 7; this->spriteSettings.draw = 3; this->frameIndex = 0; - this->timer = 0x1e; + this->timer = 30; SetDefaultPriority(this, PRIO_MESSAGE); } diff --git a/src/npc/dog.c b/src/npc/dog.c index 0b19a81c..ac2a742b 100644 --- a/src/npc/dog.c +++ b/src/npc/dog.c @@ -58,7 +58,7 @@ void sub_08069B44(Entity* this) { this->field_0x70.HALF.LO = uVar2 - 8; this->field_0x70.HALF.HI = uVar2 + 8; this->speed = 0x100; - this->timer = 0x1e; + this->timer = 30; this->animationState = 2; this->field_0x6a.HALF.LO = 0xff; this->field_0x74.HALF.LO = sub_0801E99C(this); @@ -90,7 +90,7 @@ void sub_08069C40(Entity* this) { this->animationState = GetAnimationState(this); sub_08069D00(this); } - this->timer = 0x1e; + this->timer = 30; } else { this->timer -= 1; if (this->timer == 0) { diff --git a/src/npc/ghostBrothers.c b/src/npc/ghostBrothers.c index 5c385f86..b8df90f0 100644 --- a/src/npc/ghostBrothers.c +++ b/src/npc/ghostBrothers.c @@ -103,7 +103,7 @@ void sub_08065C0C(Entity* this) { void sub_08065CCC(Entity* this) { this->action = 3; - this->timer = 0x1e; + this->timer = 30; this->spriteRendering.alphaBlend = 1; *(const u16**)&this->field_0x6c = gUnk_0811022E; gScreen.controls.layerFXControl = 0x3f40; @@ -117,7 +117,7 @@ void sub_08065D00(Entity* this) { void sub_08065D18(Entity* this) { this->action = 1; - this->timer = 0x1e; + this->timer = 30; this->subtimer = 0; this->spriteSettings.draw = 1; this->spriteRendering.alphaBlend = 1; @@ -150,7 +150,7 @@ void sub_08065DB8(Entity* this) { case 0: { if ((gMessage.doTextBox & 0x7f) == 0) { this->subAction++; - this->timer = 0x3c; + this->timer = 60; InitAnimationForceUpdate(this, 4); } break; @@ -176,7 +176,7 @@ void sub_08065DB8(Entity* this) { case 4: { if ((gMessage.doTextBox & 0x7f) == 0) { this->subAction++; - this->timer = 0x1e; + this->timer = 30; *(const u16**)&this->field_0x6c = gUnk_0811022E; } break; diff --git a/src/npc/guard.c b/src/npc/guard.c index 56327f3d..fe0fcb7b 100644 --- a/src/npc/guard.c +++ b/src/npc/guard.c @@ -61,7 +61,7 @@ void sub_08063D44(Entity* this) { case 0 ... 3: ent = CreateProjectile(GUARD_LINE_OF_SIGHT); ent->parent = this; - ent->subtimer = 0x3c; + ent->subtimer = 60; break; case 4 ... 5: sub_08078778(this); @@ -75,7 +75,7 @@ void sub_08063D44(Entity* this) { void sub_08063DC8(Entity* this) { if (this->type == 0xff) { this->action = 2; - this->timer = 0x1e; + this->timer = 30; this->animationState = sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)); InitAnimationForceUpdate(this, this->animationState + 4); } else { diff --git a/src/npc/picolyteBottle.c b/src/npc/picolyteBottle.c index 552da6fc..24cd8acf 100644 --- a/src/npc/picolyteBottle.c +++ b/src/npc/picolyteBottle.c @@ -77,7 +77,7 @@ void PicolyteBottle_Action1(PicolyteBottleEntity* this) { } this->ent1->timer++; this->ent2->timer++; - super->timer = 0xff; + super->timer = 255; SetRoomFlag(0); } } @@ -117,7 +117,7 @@ void sub_0806E014(PicolyteBottleEntity* this) { uVar1 = (Random() & 0x70) >> 4; super->type2 = 0xff; - super->timer = 0xff; + super->timer = 255; if (CheckLocalFlag(0x93) == 0) { super->damage = 0; iVar2 = uVar1 * 2; @@ -126,7 +126,7 @@ void sub_0806E014(PicolyteBottleEntity* this) { PositionRelative(super, this->ent1, 0x480000, 0x480000); this->ent2->subtimer = ptr[1]; PositionRelative(super, this->ent2, 0x680000, 0x480000); - this->ent3->subtimer = 0xff; + this->ent3->subtimer = 255; CopyPosition(super, this->ent3); } else { super->damage = 1; diff --git a/src/npc/rem.c b/src/npc/rem.c index 9e3d238a..00a9ec5e 100644 --- a/src/npc/rem.c +++ b/src/npc/rem.c @@ -98,7 +98,7 @@ void sub_0806A458(Entity* this) { if (((this->frame & ANIM_DONE) != 0)) { this->action = 1; this->subAction = 0; - this->timer = 0x3c; + this->timer = 60; InitializeAnimation(this, 2); } break; diff --git a/src/npc/stockwell.c b/src/npc/stockwell.c index f7fec8f2..3c81cfd3 100644 --- a/src/npc/stockwell.c +++ b/src/npc/stockwell.c @@ -113,7 +113,7 @@ void sub_080651D8(Entity* this) { void sub_080651F8(Entity* this) { if ((this->frame & 0x20) == 0) { this->subAction = 1; - this->timer = 0x3c; + this->timer = 60; InitializeAnimation(this, 1); CreateSpeechBubbleExclamationMark(this, 8, 0xffffffe8); SetPlayerControl(1); @@ -131,7 +131,7 @@ void sub_08065250(Entity* this) { switch (sub_08056338()) { case 0: this->subAction += 1; - this->timer = 0x1e; + this->timer = 30; this->subtimer = 0; CreateSpeechBubbleExclamationMark(this, 8, 0xffffffe8); break; diff --git a/src/object/bigBarrel.c b/src/object/bigBarrel.c index 1f9f698a..44e8ee61 100644 --- a/src/object/bigBarrel.c +++ b/src/object/bigBarrel.c @@ -221,7 +221,7 @@ void sub_08088DB4(BigBarrelEntity* this) { if (--super->timer) { return; } - super->timer = 0x1e; + super->timer = 30; super->frameIndex++; super->action++; break; @@ -301,7 +301,7 @@ void sub_08088F20(BigBarrelEntity* this) { return; } super->action = 4; - super->timer = 0x78; + super->timer = 120; break; default: if (--super->timer == 0x5a) { diff --git a/src/object/bigIceBlock.c b/src/object/bigIceBlock.c index e3251336..289c41ef 100644 --- a/src/object/bigIceBlock.c +++ b/src/object/bigIceBlock.c @@ -96,7 +96,7 @@ void BigIceBlock_Action2(BigIceBlockEntity* this) { } } super->action = 3; - super->timer = 0x3c; + super->timer = 60; super->flags &= 0x7f; } diff --git a/src/object/bigPushableLever.c b/src/object/bigPushableLever.c index b36a0c00..24adbebd 100644 --- a/src/object/bigPushableLever.c +++ b/src/object/bigPushableLever.c @@ -82,7 +82,7 @@ void BigPushableLever_Pushing(BigPushableLeverEntity* this) { void BigPushableLever_SetIdle(BigPushableLeverEntity* this) { super->action = IDLE; - this->timer = 0x3c; + this->timer = 60; BigPushableLever_SetTiles(this); } @@ -116,7 +116,7 @@ bool32 BigPushableLever_ShouldStartPushing(BigPushableLeverEntity* this) { BigPushableLever_CalculateSpriteOffsets(this); SetTile(gUnk_081236E8[super->type2], this->tilePositionLower, super->collisionLayer); } else { - this->timer = 0x3c; + this->timer = 60; super->spriteOffsetX = 0; super->spriteOffsetY = 0; } diff --git a/src/object/chestSpawner.c b/src/object/chestSpawner.c index 0e6eadf6..c37e7601 100644 --- a/src/object/chestSpawner.c +++ b/src/object/chestSpawner.c @@ -102,7 +102,7 @@ void ChestSpawner_Type2Action1(ChestSpawnerEntity* this) { gPauseMenuOptions.disabled = 1; super->action = 2; super->subAction = 0; - super->subtimer = 0x1e; + super->subtimer = 30; super->spriteSettings.draw = 1; super->spriteRendering.alphaBlend = 1; RequestPriorityDuration(super, 0x1e); @@ -152,7 +152,7 @@ void ChestSpawner_Type2Action3(ChestSpawnerEntity* this) { sub_0800445C(super); if (super->interactType != 0) { super->action = 4; - super->subtimer = 0x1e; + super->subtimer = 30; sub_080788E0(super); RequestPriorityDuration(super, 0x3c); SoundReq(SFX_CHEST_OPEN); diff --git a/src/object/crenelBeanSprout.c b/src/object/crenelBeanSprout.c index 77c7d80b..28e4d97e 100644 --- a/src/object/crenelBeanSprout.c +++ b/src/object/crenelBeanSprout.c @@ -301,7 +301,7 @@ void CrenelBeanSprout_Action6SubAction1(CrenelBeanSproutEntity* this) { if (super->type2 == super->subtimer) { gPlayerState.keepFacing &= 0x7f; super->subAction++; - super->timer = 0x3c; + super->timer = 60; } else { super->timer = 0x0f; } diff --git a/src/object/ezloCap.c b/src/object/ezloCap.c index 9780c525..5fbc1910 100644 --- a/src/object/ezloCap.c +++ b/src/object/ezloCap.c @@ -142,7 +142,7 @@ void EzloCap_Type1Action1(EzloCapEntity* this) { } if (super->timer == 6) { super->subAction = 3; - super->timer = 0x3c; + super->timer = 60; super->parent->type2 = 1; InitAnimationForceUpdate(super, 0x1c); } else { diff --git a/src/object/figurineDevice.c b/src/object/figurineDevice.c index d17525d6..7d077627 100644 --- a/src/object/figurineDevice.c +++ b/src/object/figurineDevice.c @@ -112,7 +112,7 @@ void FigurineDevice_Init(FigurineDeviceEntity* this) { InitializeAnimation(super, 1); break; case 3: - super->timer = 0x1e; + super->timer = 30; super->subtimer = 0; this->unk_81 = 1; this->unk_7a = 0; @@ -254,7 +254,7 @@ void FigurineDevice_Action4(FigurineDeviceEntity* this) { if ((gInput.newKeys & 1) != 0) { SoundReq(SFX_TEXTBOX_SELECT); this->unk_7a = 2; - super->timer = 0x3c; + super->timer = 60; sub_08050384(); return; } diff --git a/src/object/gyorgBossObject.c b/src/object/gyorgBossObject.c index 8aaf2a93..8a2ee8b4 100644 --- a/src/object/gyorgBossObject.c +++ b/src/object/gyorgBossObject.c @@ -463,7 +463,7 @@ void sub_080A1FF0(GyorgBossObjectEntity* this) { if (EntityWithinDistance(&gPlayerEntity, gRoomControls.origin_x + 0x200, gRoomControls.origin_y + 0x210, 0x100)) { if (super->timer == 0) { - super->timer = 0x78; + super->timer = 120; } else { if (super->timer == 0x23) { InitScreenShake(30, 0); diff --git a/src/object/keyStealingTakkuri.c b/src/object/keyStealingTakkuri.c index 9d6390f7..4d7a38e4 100644 --- a/src/object/keyStealingTakkuri.c +++ b/src/object/keyStealingTakkuri.c @@ -61,7 +61,7 @@ void KeyStealingTakkuri_Type0_Init(KeyStealingTakkuriEntity* this) { Entity* entity; super->action++; super->collisionLayer = 1; - super->timer = 0x1e; + super->timer = 30; super->subtimer = 0; super->spriteRendering.b3 = 1; super->speed = 0; @@ -189,7 +189,7 @@ void KeyStealingTakkuri_Type2_Init(KeyStealingTakkuriEntity* this) { super->action++; super->collisionLayer = 2; - super->timer = 0x1e; + super->timer = 30; super->subtimer = 1; super->spriteRendering.b3 = 1; super->speed = 0; @@ -236,7 +236,7 @@ void KeyStealingTakkuri_Type2_Action3(KeyStealingTakkuriEntity* this) { this->unk_6e += 8; if (--this->unk_6c == 0) { super->action++; - super->timer = 0x1e; + super->timer = 30; super->spriteSettings.flipX = 0; } else { sub_0809E238(this); @@ -306,7 +306,7 @@ void KeyStealingTakkuri_Type3_Action1(KeyStealingTakkuriEntity* this) { switch (sub_0809E2C4(this, super->type2)) { case 1: super->action += 2; - super->timer = 0xff; + super->timer = 255; InitAnimationForceUpdate(super, super->animIndex + 2); SoundReq(SFX_123); child = super->child; diff --git a/src/object/ladderUp.c b/src/object/ladderUp.c index 46c99d40..e068963b 100644 --- a/src/object/ladderUp.c +++ b/src/object/ladderUp.c @@ -43,7 +43,7 @@ void LadderUp(Entity* this) { SoundReq(SFX_10B); this->action = 2; #ifndef EU - this->timer = 0x3c; + this->timer = 60; #endif } break; diff --git a/src/object/minecart.c b/src/object/minecart.c index 1b2988d1..c5ef1e98 100644 --- a/src/object/minecart.c +++ b/src/object/minecart.c @@ -154,7 +154,7 @@ void sub_080919AC(MinecartEntity* this) { if (super->subtimer-- == 0) { SoundReq(SFX_PLY_VO7); - super->subtimer = 0x3c; + super->subtimer = 60; } uVar3 = GetRelativeCollisionTile(super, gUnk_081223C8[super->animationState * 2], diff --git a/src/object/object12.c b/src/object/object12.c index d99bc2ad..5326337f 100644 --- a/src/object/object12.c +++ b/src/object/object12.c @@ -56,7 +56,7 @@ void Object12_Action2(Object12Entity* this) { u32 tmp2; if (--super->timer == 0) { super->action = 3; - super->timer = 0x1e; + super->timer = 30; super->spriteOffsetY = 4; gScreen.lcd.displayControl |= 0x2000; gScreen.controls.windowInsideControl = 0x1f; diff --git a/src/object/object30.c b/src/object/object30.c index 6ebc3d4f..6a1a3d2c 100644 --- a/src/object/object30.c +++ b/src/object/object30.c @@ -103,7 +103,7 @@ void Object30_Action2(Object30Entity* this) { void sub_0808A968(Object30Entity* this) { super->action = 2; - super->timer = 0x1e; + super->timer = 30; super->spriteSettings.draw = 1; super->zVelocity = Q_16_16(2.5); super->spritePriority.b1 = 3; diff --git a/src/object/object35.c b/src/object/object35.c index cee74852..17d9733d 100644 --- a/src/object/object35.c +++ b/src/object/object35.c @@ -99,7 +99,7 @@ void Object35_Type1Init(Object35Entity* this) { this->unk_74 = GetTileIndex(this->unk_76, super->collisionLayer); if (super->timer == 0) { super->action = 1; - super->subtimer = 0x78; + super->subtimer = 120; SetTile(0x4022, this->unk_76, super->collisionLayer); } else { super->action = 3; diff --git a/src/object/object36.c b/src/object/object36.c index cb262560..85762107 100644 --- a/src/object/object36.c +++ b/src/object/object36.c @@ -38,7 +38,7 @@ void sub_0808BB30(Object36Entity* this) { } else { super->action = 1; super->flags |= ENT_COLLIDE; - super->timer = 0x78; + super->timer = 120; super->subtimer = 0; super->spriteRendering.b3 = 3; super->spritePriority.b0 = 4; @@ -100,7 +100,7 @@ void sub_0808BC3C(Object36Entity* this) { } } } else { - super->timer = 0x78; + super->timer = 120; super->spriteSettings.draw = 0; if (super->subtimer != 0) { super->subtimer = 0; @@ -130,7 +130,7 @@ void sub_0808BD14(Object36Entity* this) { } else { if ((super->flags & ENT_COLLIDE) != 0) { super->flags &= ~ENT_COLLIDE; - super->timer = 0x1e; + super->timer = 30; } else { super->spriteSettings.draw ^= 1; if (--super->timer == 0) { diff --git a/src/object/object3D.c b/src/object/object3D.c index 82213ab0..542167c4 100644 --- a/src/object/object3D.c +++ b/src/object/object3D.c @@ -71,8 +71,8 @@ void Object3D_Action1(Object3DEntity* this) { super->spriteOrientation.flipY = 0; super->spriteRendering.b3 = 0; super->spritePriority.b0 = 0; - super->timer = 0x1e; - super->subtimer = 0xff; + super->timer = 30; + super->subtimer = 255; super->spriteRendering.b0 = 3; SetAffineInfo(super, 0x100, 0x100, 0); gArea.field_0x10 = 1; diff --git a/src/object/object42.c b/src/object/object42.c index 9f32164e..e75d74c9 100644 --- a/src/object/object42.c +++ b/src/object/object42.c @@ -39,7 +39,7 @@ void Object42(Object42Entity* this) { void sub_0808DDB4(Object42Entity* this) { super->action = 1; if (super->type != 0) { - super->timer = 0x78; + super->timer = 120; this->unk_6c = 0xf0; InitializeAnimation(super, 0); sub_0808DDE8(this); diff --git a/src/object/object4B.c b/src/object/object4B.c index 42677c72..8f923a5d 100644 --- a/src/object/object4B.c +++ b/src/object/object4B.c @@ -34,13 +34,13 @@ void Object4B(Object4BEntity* this) { void Object4B_Init(Object4BEntity* this) { super->action = 1; - super->timer = 0x3c; + super->timer = 60; InitializeAnimation(super, 0); } void Object4B_Action1(Object4BEntity* this) { if (--super->timer == 0) { - super->timer = 0x78; + super->timer = 120; super->action++; super->spriteSettings.draw = 1; } @@ -82,7 +82,7 @@ void Object4B_Action4(Object4BEntity* this) { super->y.HALF.HI = gRoomControls.origin_y + 0x230; if ((super->frame & ANIM_DONE) != 0) { super->action++; - super->timer = 0x78; + super->timer = 120; InitializeAnimation(super, 2); } } else if ((super->frame & ANIM_DONE) != 0) { @@ -104,7 +104,7 @@ void Object4B_Action6(Object4BEntity* this) { GetNextFrame(super); if ((super->frame & ANIM_DONE) != 0) { super->action++; - super->timer = 0x3c; + super->timer = 60; InitializeAnimation(super, 1); } } diff --git a/src/object/object61.c b/src/object/object61.c index acf2c4af..e9107fc6 100644 --- a/src/object/object61.c +++ b/src/object/object61.c @@ -95,7 +95,7 @@ void Object61_Action1Type0(Object61Entity* this) { this->unk_6e = 0x100; } if (this->unk_6e == 0x100) { - super->subtimer = 0xff; + super->subtimer = 255; } } else { sub_080936C8(this); diff --git a/src/object/object74.c b/src/object/object74.c index 977d9365..f086a754 100644 --- a/src/object/object74.c +++ b/src/object/object74.c @@ -95,7 +95,7 @@ void sub_08097CB4(Object74Entity* this) { super->action = 3; super->spriteSettings.draw = 1; super->spriteRendering.alphaBlend = 1; - super->timer = 0x1e; + super->timer = 30; super->subtimer = 0; gScreen.controls.layerFXControl = 0xf40; gScreen.controls.alphaBlend = 0x1000; diff --git a/src/object/object8E.c b/src/object/object8E.c index c987b2e8..4cbb6934 100644 --- a/src/object/object8E.c +++ b/src/object/object8E.c @@ -40,7 +40,7 @@ void Object8E_Type0(Object8EEntity* this) { switch (super->action) { case 0: super->action = 1; - super->timer = 0x3c; + super->timer = 60; super->subtimer = 0; gRoomControls.camera_target = super; gRoomControls.unk5 = 1; @@ -67,7 +67,7 @@ void Object8E_Type0(Object8EEntity* this) { } } else { super->action = 2; - super->timer = 0x3c; + super->timer = 60; gScreen.lcd.displayControl &= 0xdfff; gRoomControls.camera_target = &gPlayerEntity; SoundReq(SFX_134); @@ -114,7 +114,7 @@ void Object8E_Type1(Object8EEntity* this) { switch (super->action) { case 0: super->action = 1; - super->timer = 0x3c; + super->timer = 60; super->subtimer = 0x20; gRoomControls.camera_target = super; gRoomControls.unk5 = 1; @@ -141,7 +141,7 @@ void Object8E_Type1(Object8EEntity* this) { } } else { super->action = 2; - super->timer = 0x3c; + super->timer = 60; gRoomControls.camera_target = &gPlayerEntity; SoundReq(SFX_134); } @@ -165,7 +165,7 @@ void Object8E_Type2(Object8EEntity* this) { switch (super->action) { case 0: super->action++; - super->timer = 0x3c; + super->timer = 60; super->subtimer = 0; gRoomControls.camera_target = super; gRoomControls.unk5 = 1; @@ -194,7 +194,7 @@ void Object8E_Type2(Object8EEntity* this) { } } else { super->action = 2; - super->timer = 0x1e; + super->timer = 30; gScreen.lcd.displayControl = (gScreen.lcd.displayControl & 0xdfff) | 0x4800; super->x.HALF.HI += 0x68; super->y.HALF.HI += 0x28; @@ -205,7 +205,7 @@ void Object8E_Type2(Object8EEntity* this) { break; case 2: if (sub_0809BE78(this) && (--super->timer == 0)) { - super->timer = 0x78; + super->timer = 120; super->action = 3; SetLocalFlag(0x35); SoundReq(SFX_SECRET); @@ -235,7 +235,7 @@ void Object8E_Type3(Object8EEntity* this) { switch (super->action) { case 0: super->action = 1; - super->timer = 0x3c; + super->timer = 60; super->subtimer = 0; gRoomControls.camera_target = super; gRoomControls.unk5 = 1; @@ -268,7 +268,7 @@ void Object8E_Type3(Object8EEntity* this) { } } else { super->action = 2; - super->timer = 0x78; + super->timer = 120; gScreen.lcd.displayControl = (gScreen.lcd.displayControl & 0xdfff) | 0x4800; SetLocalFlag(0x37); SoundReq(SFX_134); @@ -291,7 +291,7 @@ void Object8E_Type4(Object8EEntity* this) { switch (super->action) { case 0: super->action = 1; - super->timer = 0x3c; + super->timer = 60; super->subtimer = 0x80; gRoomControls.camera_target = super; gRoomControls.unk5 = 1; @@ -312,7 +312,7 @@ void Object8E_Type4(Object8EEntity* this) { } } else { super->action = 2; - super->timer = 0x3c; + super->timer = 60; gRoomControls.camera_target = &gPlayerEntity; SoundReq(SFX_134); } diff --git a/src/object/octorokBossObject.c b/src/object/octorokBossObject.c index 7d47d15d..de5aa680 100644 --- a/src/object/octorokBossObject.c +++ b/src/object/octorokBossObject.c @@ -49,7 +49,7 @@ void OctorokBossObject_Init(Entity* this) { case 0: this->field_0x78.HALF.HI = 0x96; this->timer = 0; - this->subtimer = 0x1e; + this->subtimer = 30; case 1: InitializeAnimation(this, 0); EnqueueSFX(SFX_124); diff --git a/src/object/pushableGrave.c b/src/object/pushableGrave.c index 04d97a5a..aa854b9c 100644 --- a/src/object/pushableGrave.c +++ b/src/object/pushableGrave.c @@ -94,7 +94,7 @@ void PushableGrave_Action2(PushableGraveEntity* this) { if (super->subAction == 0) { if (--super->subtimer == 0) { super->subAction = 1; - super->subtimer = 0x78; + super->subtimer = 120; gRoomControls.camera_target = super; gRoomControls.unk5 = 2; } @@ -178,7 +178,7 @@ bool32 sub_0809785C(PushableGraveEntity* this) { super->action = 2; super->subAction = 0; super->timer = 0xf0; - super->subtimer = 0x3c; + super->subtimer = 60; super->direction = 0; super->speed = 0x40; RestorePrevTileEntity(this->unk_68, super->collisionLayer); diff --git a/src/object/pushableLever.c b/src/object/pushableLever.c index bdd17fa9..a2841631 100644 --- a/src/object/pushableLever.c +++ b/src/object/pushableLever.c @@ -81,7 +81,7 @@ void PushableLever_Pushing(PushableLeverEntity* this) { void PushableLever_SetIdle(PushableLeverEntity* this) { super->action = IDLE; - this->timer = 0x3c; + this->timer = 60; PushableLever_SetTiles(this); } @@ -109,7 +109,7 @@ bool32 PushableLever_ShouldStartPushing(PushableLeverEntity* this) { PushableLever_CalculateSpriteOffsets(this); SetTile(PushableLever_Tiles[super->type2], this->tilePosition, super->collisionLayer); } else { - this->timer = 0x3c; + this->timer = 60; super->spriteOffsetX = 0; super->spriteOffsetY = 0; } diff --git a/src/object/pushableStatue.c b/src/object/pushableStatue.c index c94f81fb..2a7fbf3e 100644 --- a/src/object/pushableStatue.c +++ b/src/object/pushableStatue.c @@ -226,7 +226,7 @@ bool32 sub_080895C0(PushableStatueEntity* this) { super->y.HALF.HI += gUnk_08120CBC[(super->direction >> 2) + 1]; sub_08089454(this); super->action = 4; - super->timer = 0x3c; + super->timer = 60; } sub_0800445C(super); return FALSE; diff --git a/src/object/railtrack.c b/src/object/railtrack.c index 187dd928..e4ffbce2 100644 --- a/src/object/railtrack.c +++ b/src/object/railtrack.c @@ -91,7 +91,7 @@ void sub_08085308(Entity* this) { break; case 3: if (CheckFlags(this->field_0x86.HWORD) == *(u16*)&this->field_0x7a) { - this->subtimer = 0xff; + this->subtimer = 255; } else { this->subtimer = 1; } diff --git a/src/object/smallIceBlock.c b/src/object/smallIceBlock.c index 6ba2940f..7bac6c71 100644 --- a/src/object/smallIceBlock.c +++ b/src/object/smallIceBlock.c @@ -147,7 +147,7 @@ void SmallIceBlock_Action3(SmallIceBlockEntity* this) { SoundReq(SFX_SECRET); } super->action = 4; - super->timer = 0x3c; + super->timer = 60; super->flags &= 0x7f; } diff --git a/src/object/treeHidingPortal.c b/src/object/treeHidingPortal.c index 6756d82f..f8500920 100644 --- a/src/object/treeHidingPortal.c +++ b/src/object/treeHidingPortal.c @@ -58,7 +58,7 @@ void sub_0809E86C(Entity* this) { void sub_0809E8BC(Entity* this) { if (--this->timer == 0) { this->action = 3; - this->timer = 0x3c; + this->timer = 60; this->spriteSettings.draw = 0; sub_0809E96C(this); sub_0809E918(this); diff --git a/src/object/windTribeTeleporter.c b/src/object/windTribeTeleporter.c index 5e4cb50e..f397feec 100644 --- a/src/object/windTribeTeleporter.c +++ b/src/object/windTribeTeleporter.c @@ -76,19 +76,19 @@ void WindTribeTeleporter_Action1(WindTribeTeleporterEntity* this) { void WindTribeTeleporter_Action2(WindTribeTeleporterEntity* this) { switch (super->subAction) { case 0: - super->timer = 0x1e; + super->timer = 30; super->subAction++; break; case 1: if (--super->timer == 0) { super->subAction++; - super->timer = 0x1e; + super->timer = 30; } break; case 2: if (--super->timer == 0) { super->subAction++; - super->timer = 0x1e; + super->timer = 30; SoundReq(SFX_113); } else { if ((gRoomTransition.frameCount & 7) == 0) { @@ -99,7 +99,7 @@ void WindTribeTeleporter_Action2(WindTribeTeleporterEntity* this) { case 3: if (--super->timer == 0) { super->subAction++; - super->timer = 0x1e; + super->timer = 30; } else { if ((gRoomTransition.frameCount & 3) == 0) { gPlayerEntity.animationState = (gPlayerEntity.animationState + 2) & 6; @@ -132,7 +132,7 @@ void WindTribeTeleporter_Action3(WindTribeTeleporterEntity* this) { switch (super->subAction) { case 0: super->subAction = 1; - super->timer = 0x1e; + super->timer = 30; SoundReq(SFX_114); break; case 1: @@ -142,13 +142,13 @@ void WindTribeTeleporter_Action3(WindTribeTeleporterEntity* this) { } } else { super->subAction++; - super->timer = 0x1e; + super->timer = 30; } break; case 2: if (--super->timer == 0) { super->subAction++; - super->timer = 0x1e; + super->timer = 30; } else { if ((gRoomTransition.frameCount & 3) == 0) { gPlayerEntity.animationState = (gPlayerEntity.animationState + 2) & 6; diff --git a/src/player.c b/src/player.c index 1141dc8d..92452736 100644 --- a/src/player.c +++ b/src/player.c @@ -1201,7 +1201,7 @@ static void PortalShrinkUpdate(Entity* this) { } if (*(u32*)&this->cutsceneBeh >= 0x340) { this->timer = 8; - this->subtimer = 0x1e; + this->subtimer = 30; this->subAction = 6; } else { *(u32*)&this->cutsceneBeh += uVar5 * 2; diff --git a/src/playerItem/playerItemBomb.c b/src/playerItem/playerItemBomb.c index 34d1360c..717f968f 100644 --- a/src/playerItem/playerItemBomb.c +++ b/src/playerItem/playerItemBomb.c @@ -81,7 +81,7 @@ void sub_0801B250(PlayerItemBombEntity* this) { super->spritePriority.b1 = 3; super->flags &= 0x7f; if (super->type == 0xff) { - super->timer = 0x3c; + super->timer = 60; } else if (super->type == 0xfe) { super->timer = 0x0f; super->type = 0xff; @@ -141,7 +141,7 @@ void sub_0801B368(PlayerItemBombEntity* this) { super->action -= 1; super->subAction = 0; if (0x3c < super->timer) { - super->timer = 0x3c; + super->timer = 60; } } diff --git a/src/playerItem/playerItemBottle.c b/src/playerItem/playerItemBottle.c index ad27462f..e2f1d57d 100644 --- a/src/playerItem/playerItemBottle.c +++ b/src/playerItem/playerItemBottle.c @@ -62,7 +62,7 @@ void PlayerItemBottle_Init(Entity* this) { case ITEM_BOTTLE_PICOLYTE_BLUE: case ITEM_BOTTLE_PICOLYTE_WHITE: this->timer = 0xd5; - this->subtimer = 0x3c; + this->subtimer = 60; break; case BOTTLE_CHARM_NAYRU: case BOTTLE_CHARM_FARORE: diff --git a/src/playerItem/playerItemBow.c b/src/playerItem/playerItemBow.c index 5451585f..6f9014ef 100644 --- a/src/playerItem/playerItemBow.c +++ b/src/playerItem/playerItemBow.c @@ -161,7 +161,7 @@ void sub_0801917C(PlayerItemBowEntity* this) { } if ((sub_080B1BA4(COORD_TO_TILE(super), gPlayerEntity.collisionLayer, 0x80) == 0) && (!tmp2) && sub_080040D8(super, &gUnk_08003E44, super->x.HALF.HI, super->y.HALF.HI) != 0) { - super->timer = 0x1e; + super->timer = 30; super->action++; if (super->hurtType == 0x0e) { sub_08019468(this); diff --git a/src/playerItem/playerItemCellOverwriteSet.c b/src/playerItem/playerItemCellOverwriteSet.c index 20636f7b..5a5ff939 100644 --- a/src/playerItem/playerItemCellOverwriteSet.c +++ b/src/playerItem/playerItemCellOverwriteSet.c @@ -36,7 +36,7 @@ void PlayerItemCellOverwriteSet(Entity* this) { } if ((gInput.heldKeys & (DPAD_LEFT | DPAD_RIGHT)) != 0) { if (++this->subtimer > 0x1e) { - this->subtimer = 0x1e; + this->subtimer = 30; if ((gInput.heldKeys & DPAD_RIGHT) != 0) { this->field_0x6c.HWORD--; } diff --git a/src/projectile/cannonballProjectile.c b/src/projectile/cannonballProjectile.c index 0276947b..2a83603e 100644 --- a/src/projectile/cannonballProjectile.c +++ b/src/projectile/cannonballProjectile.c @@ -78,7 +78,7 @@ bool32 sub_080AB634(Entity* this) { if (entities[i] != NULL && (IsColliding(this, entities[i]) != 0)) { if (entities[i]->action < 3) { entities[i]->action = 3; - entities[i]->timer = 0x1e; + entities[i]->timer = 30; entities[i]->spriteSettings.draw = 0; CreateFx(entities[i], FX_WHITE_ROCK, 0); } diff --git a/src/projectile/gleerokProjectile.c b/src/projectile/gleerokProjectile.c index 7db97e98..47e82d59 100644 --- a/src/projectile/gleerokProjectile.c +++ b/src/projectile/gleerokProjectile.c @@ -58,7 +58,7 @@ void GleerokProjectile_Init(Entity* this) { iVar2 = 0x400; } this->zVelocity = this->z.WORD / (iVar2 << 8) << 0xd; - this->subtimer = 0x1e; + this->subtimer = 30; break; case 2: this->zVelocity = (this->z.WORD / 0x18000) << 0xc; @@ -92,7 +92,7 @@ void GleerokProjectile_Action1(Entity* this) { GetNextFrame(this); LinearMoveUpdate(this); if ((this->type != 2) && (this->subtimer-- == 0)) { - this->subtimer = 0x1e; + this->subtimer = 30; sub_08004596(this, GetFacingDirection(this, &gPlayerEntity)); } if (GravityUpdate(this, 0) == 0) { diff --git a/src/projectile/gyorgMaleEnergyProjectile.c b/src/projectile/gyorgMaleEnergyProjectile.c index 4fb25abe..c71a8e39 100644 --- a/src/projectile/gyorgMaleEnergyProjectile.c +++ b/src/projectile/gyorgMaleEnergyProjectile.c @@ -44,7 +44,7 @@ void sub_080AC8DC(Entity* this) { void GyorgMaleEnergyProjectile_Init(Entity* this) { this->action = 1; - this->timer = 0x3c; + this->timer = 60; this->collisionLayer = 2; UpdateSpriteForCollisionLayer(this); InitializeAnimation(this, 0); diff --git a/src/projectile/gyorgTail.c b/src/projectile/gyorgTail.c index 586c90bd..c9ce481a 100644 --- a/src/projectile/gyorgTail.c +++ b/src/projectile/gyorgTail.c @@ -355,7 +355,7 @@ void sub_080AC884(Entity* this) { if (this->parent->field_0x70.HALF_U.HI != 0) { this->parent->field_0x70.HALF_U.HI = 0; this->action = 2; - this->timer = 0x3c; + this->timer = 60; this->subtimer = 0x56; } } diff --git a/src/projectile/mandiblesProjectile.c b/src/projectile/mandiblesProjectile.c index a468d8a1..622b8404 100644 --- a/src/projectile/mandiblesProjectile.c +++ b/src/projectile/mandiblesProjectile.c @@ -186,7 +186,7 @@ void MandiblesProjectile_Action4(Entity* this) { entity->speed = 0; entity->field_0x82.HALF.LO = 1; entity->timer = 0; - entity->subtimer = 0x78; + entity->subtimer = 120; entity->field_0x80.HWORD = 0x20; sub_080AA3E0(entity, 1); } diff --git a/src/projectile/torchTrapProjectile.c b/src/projectile/torchTrapProjectile.c index 402dc60a..b3d86421 100644 --- a/src/projectile/torchTrapProjectile.c +++ b/src/projectile/torchTrapProjectile.c @@ -20,7 +20,7 @@ void sub_080AAB1C(Entity* this) { void TorchTrapProjectile_Init(Entity* this) { this->action = 1; - this->timer = 0x1e; + this->timer = 30; InitializeAnimation(this, 0); } diff --git a/src/projectile/v1DarkMagicProjectile.c b/src/projectile/v1DarkMagicProjectile.c index 00c1366d..d6c4b568 100644 --- a/src/projectile/v1DarkMagicProjectile.c +++ b/src/projectile/v1DarkMagicProjectile.c @@ -200,7 +200,7 @@ void sub_080AAF74(Entity* this) { this->field_0x80.HALF.LO += (Random() & 1) + 1; } if (++this->timer == 0x3c) { - this->timer = 0x1e; + this->timer = 30; gPlayerEntity.iframes = 8; ModHealth(-4); SoundReqClipped(&gPlayerEntity, SFX_PLY_VO6); diff --git a/src/projectile/v3ElectricProjectile.c b/src/projectile/v3ElectricProjectile.c index bbbec2ab..f360afa5 100644 --- a/src/projectile/v3ElectricProjectile.c +++ b/src/projectile/v3ElectricProjectile.c @@ -51,7 +51,7 @@ void sub_080ABFEC(Entity* this) { default: { this->action = 2; this->timer = 0; - this->subtimer = 0xff; + this->subtimer = 255; this->speed = projectileSpeeds[this->type2]; this->damage = 0x88; sound = SFX_193; diff --git a/src/staffroll.c b/src/staffroll.c index d31ea833..632aa62c 100644 --- a/src/staffroll.c +++ b/src/staffroll.c @@ -65,7 +65,7 @@ void StaffrollTask_State0(void) { SetGlobalFlag(GAMECLEAR); gMain.state = 1; gStaffrollMenu.base.menuType = 0; - gStaffrollMenu.base.transitionTimer = 0xb4; + gStaffrollMenu.base.transitionTimer = 180; gStaffrollMenu.unk_16 = 5; gStaffrollMenu.unk_17 = 4; gStaffrollMenu.bgmMusicStarted = 0; @@ -241,7 +241,7 @@ void StaffrollTask_State2(void) { switch (gStaffrollMenu.base.overlayType) { case 0: gStaffrollMenu.base.overlayType = 1; - gStaffrollMenu.base.transitionTimer = 0x1e; + gStaffrollMenu.base.transitionTimer = 30; gStaffrollMenu.base.field_0x3 = 0; DispReset(1); InitSoundPlayingInfo(); @@ -278,7 +278,7 @@ void StaffrollTask_State2(void) { tmp = 2; } gStaffrollMenu.base.overlayType = tmp; - gStaffrollMenu.base.transitionTimer = 0x3c; + gStaffrollMenu.base.transitionTimer = 60; SoundReq(SFX_TEXTBOX_SELECT); break; } @@ -298,7 +298,7 @@ void StaffrollTask_State2(void) { gStaffrollMenu.base.overlayType = 4; break; case SAVE_ERROR: - gStaffrollMenu.base.transitionTimer = 0x3c; + gStaffrollMenu.base.transitionTimer = 60; CreateDialogBox(9, 0); gStaffrollMenu.base.overlayType = 3; break; diff --git a/src/subtask.c b/src/subtask.c index 3126c4b8..ecc923fd 100644 --- a/src/subtask.c +++ b/src/subtask.c @@ -127,7 +127,7 @@ void sub_08054C88(void) { SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 0x10); SoundReq(SFX_SECRET_BIG); gMenu.overlayType++; - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; } } @@ -154,7 +154,7 @@ void sub_08054D3C(void) { sub_0801876C(gMenu.field_0x4, 1); sub_080553E0(gMenu.field_0x4); gMenu.overlayType++; - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; } } @@ -354,7 +354,7 @@ void sub_08055184(void) { sub_08055B70(gMenu.field_0x4, 0, 0, 0); gMenu.overlayType++; gMenu.storyPanelIndex = 0; - gMenu.transitionTimer = 0x3c; + gMenu.transitionTimer = 60; gMenu.field_0xa = 0; gUpdateVisibleTiles = 1; SetFade(FADE_INSTANT, 0x10); @@ -380,7 +380,7 @@ void sub_0805524C(void) { } else { gScreen.lcd.displayControl &= 0xf7ff; gScreen.controls.alphaBlend = 0x1000; - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; gMenu.overlayType++; #ifndef EU SoundReq(SFX_SECRET_BIG); @@ -420,7 +420,7 @@ void sub_08055380(void) { SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 0x10); SoundReq(SFX_SECRET_BIG); gMenu.overlayType++; - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; } } @@ -465,7 +465,7 @@ void sub_08055498(void) { SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 0x10); SoundReq(SFX_SECRET_BIG); gMenu.overlayType++; - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; } } @@ -579,7 +579,7 @@ void sub_08055710(void) { void sub_0805576C(void) { if ((gFadeControl.active == 0) && CheckRoomFlag(0xff)) { gMenu.overlayType++; - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; } } @@ -657,7 +657,7 @@ void sub_08055948(void) { if ((gFadeControl.active == 0) && CheckRoomFlag(0xff)) { sub_08055994(); gMenu.overlayType++; - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; } } @@ -709,7 +709,7 @@ void sub_08055A6C(void) { SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 0x10); SoundReq(SFX_SECRET_BIG); gMenu.overlayType++; - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; } } @@ -737,7 +737,7 @@ void sub_08055AEC(void) { void sub_08055B38(void) { if (gFadeControl.active == 0) { - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; } } @@ -794,7 +794,7 @@ void sub_08055C34(void) { SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 0x10); SoundReq(SFX_SECRET_BIG); gMenu.overlayType++; - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; } } @@ -822,7 +822,7 @@ void sub_08055D2C(void) { sub_0801876C(gMenu.field_0x4, 1); sub_080553E0(gMenu.field_0x4); gMenu.overlayType++; - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; } } @@ -846,7 +846,7 @@ void sub_08055DC0(void) { if (gFadeControl.active == 0) { MessageFromTarget(TEXT_INDEX(TEXT_EMPTY, 0x01)); gMenu.overlayType++; - gMenu.transitionTimer = 0x78; + gMenu.transitionTimer = 120; } } diff --git a/src/subtask2.c b/src/subtask2.c index 9e430801..36030515 100644 --- a/src/subtask2.c +++ b/src/subtask2.c @@ -474,7 +474,7 @@ void sub_080A59C8(void) { } if (bVar3) { - gMenu.transitionTimer = 0xff; + gMenu.transitionTimer = 255; if (uVar2 == 0) { CreateDialogBox(8, 0); SetMenuType(2); @@ -494,7 +494,7 @@ void sub_080A5A54(void) { switch (HandleSave(0)) { case SAVE_ERROR: CreateDialogBox(9, 0); - gMenu.transitionTimer = 0x3c; + gMenu.transitionTimer = 60; // fallthrough case SAVE_OK: SetMenuType(3); @@ -510,7 +510,7 @@ void sub_080A5A90(void) { switch (gMenu.transitionTimer) { case 0: if ((gInput.newKeys & (START_BUTTON | B_BUTTON | A_BUTTON)) != 0) { - gMenu.transitionTimer = 0xff; + gMenu.transitionTimer = 255; } break; case 0xff: @@ -580,7 +580,7 @@ void sub_080A5B34(void) { if (bVar1) { if (uVar3 == 0) { SetFade(FADE_IN_OUT | FADE_BLACK_WHITE | FADE_INSTANT, 0x20); - gMenu.transitionTimer = 0x3c; + gMenu.transitionTimer = 60; SetMenuType(2); } else { SoundReq(SFX_MENU_CANCEL); @@ -1084,7 +1084,7 @@ void sub_080A6534(void) { gSave.field_0x20 |= val; gGenericMenu.unk10.h[1] = val & gGenericMenu.unk10.h[0]; gGenericMenu.unk10.h[0] = 0; - gMenu.transitionTimer = 0x3c; + gMenu.transitionTimer = 60; SetMenuType(1); SetFade(FADE_INSTANT, 8); } @@ -1415,7 +1415,7 @@ void sub_080A6B04(void) { gMenu.field_0xa = uVar6; } } - gMenu.transitionTimer = 0x1e; + gMenu.transitionTimer = 30; SetMenuType(1); SetFade(FADE_INSTANT, 8); }