diff --git a/src/manager/cameraTargetManager.c b/src/manager/cameraTargetManager.c index dc886926..22347855 100644 --- a/src/manager/cameraTargetManager.c +++ b/src/manager/cameraTargetManager.c @@ -51,7 +51,7 @@ void CameraTargetManager_Action1(CameraTargetManager* this) { object->y.HALF.HI = this->field_0x3a + gRoomControls.origin_y; super->child = object; gRoomControls.camera_target = object; - RequestPriorityDuration(object, 0x1e); + RequestPriorityDuration(object, 30); } } } diff --git a/src/manager/miscManager.c b/src/manager/miscManager.c index 9ba3d440..ed7f9277 100644 --- a/src/manager/miscManager.c +++ b/src/manager/miscManager.c @@ -155,7 +155,7 @@ void MiscManager_Type1(MiscManager* this) { if (CheckFlags(this->unk_3e)) { super->action = 2; super->timer = 120; - RequestPriorityDuration((Entity*)this, 0xF0); + RequestPriorityDuration((Entity*)this, 240); sub_08059064(this); } break; @@ -245,7 +245,7 @@ void MiscManager_Type5(MiscManager* this) { break; case 1: if (CheckFlags(this->unk_3e)) { - RequestPriorityDuration((Entity*)this, 0x4b); + RequestPriorityDuration((Entity*)this, 75); super->timer = 45;; super->action++; } diff --git a/src/object/bigBarrel.c b/src/object/bigBarrel.c index 44e8ee61..25c8a48d 100644 --- a/src/object/bigBarrel.c +++ b/src/object/bigBarrel.c @@ -278,7 +278,7 @@ void sub_08088F20(BigBarrelEntity* this) { } super->action = 2; super->timer = 30; - RequestPriorityDuration(super, 0x10e); + RequestPriorityDuration(super, 270); pEVar3 = CreateObject(OBJECT_2A, 1, 0); if (pEVar3 != NULL) { pEVar3->updatePriority = 3; @@ -315,7 +315,7 @@ void sub_08088F20(BigBarrelEntity* this) { if (super->timer == 0) { gRoomVars.animFlags &= ~0x10; if (CheckLocalFlags(0x15, 2)) { - RequestPriorityDuration(super, 0x3c); + RequestPriorityDuration(super, 60); SoundReq(SFX_SECRET); } DeleteEntity(super); diff --git a/src/object/bigPushableLever.c b/src/object/bigPushableLever.c index 24adbebd..8403bbea 100644 --- a/src/object/bigPushableLever.c +++ b/src/object/bigPushableLever.c @@ -56,7 +56,7 @@ void BigPushableLever_Idle(BigPushableLeverEntity* this) { SetTile(this->tileIndexUpper, this->tilePositionUpper, super->collisionLayer); SetTile(this->tileIndexLower, this->tilePositionLower, super->collisionLayer); EnqueueSFX(SFX_132); - RequestPriorityDuration(super, 0x1e); + RequestPriorityDuration(super, 30); if (PlayerCanBeMoved()) { gPlayerState.pushedObject = 0x98; gPlayerState.queued_action = 5; diff --git a/src/object/button.c b/src/object/button.c index b80f5c8c..9688c31d 100644 --- a/src/object/button.c +++ b/src/object/button.c @@ -53,7 +53,7 @@ void sub_08081BAC(Entity* this) { if (sub_08081CB0(this)) { this->subAction = 0; this->timer = 10; - RequestPriorityDuration(this, 0xA); + RequestPriorityDuration(this, 10); sub_08081FF8(this); if (this->type == 1) { this->action = 3; diff --git a/src/object/chestSpawner.c b/src/object/chestSpawner.c index 6d74cc64..1c8527e1 100644 --- a/src/object/chestSpawner.c +++ b/src/object/chestSpawner.c @@ -105,7 +105,7 @@ void ChestSpawner_Type2Action1(ChestSpawnerEntity* this) { super->subtimer = 30; super->spriteSettings.draw = 1; super->spriteRendering.alphaBlend = 1; - RequestPriorityDuration(super, 0x1e); + RequestPriorityDuration(super, 30); sub_0805BC4C(); } } @@ -113,7 +113,7 @@ void ChestSpawner_Type2Action1(ChestSpawnerEntity* this) { void ChestSpawner_Type2Action2(ChestSpawnerEntity* this) { u32 tmp; - SetPriorityTimer(0x1e); + SetPriorityTimer(30); switch (super->subAction) { case 0: if (EntityInRectRadius(super, &gPlayerEntity, 0x10, 8)) { @@ -154,7 +154,7 @@ void ChestSpawner_Type2Action3(ChestSpawnerEntity* this) { super->action = 4; super->subtimer = 30; sub_080788E0(super); - RequestPriorityDuration(super, 0x3c); + RequestPriorityDuration(super, 60); SoundReq(SFX_CHEST_OPEN); } } diff --git a/src/object/fourElements.c b/src/object/fourElements.c index 68d22044..f65edf16 100644 --- a/src/object/fourElements.c +++ b/src/object/fourElements.c @@ -113,7 +113,7 @@ void FourElements_Action3(FourElementsEntity* this) { SetDefaultPriority(&gPlayerEntity, 0); } } else { - RequestPriorityDuration(NULL, 0x3c); + RequestPriorityDuration(NULL, 60); if (sub_0808C67C()) { super->action = 4; } @@ -121,7 +121,7 @@ void FourElements_Action3(FourElementsEntity* this) { } void FourElements_Action4(FourElementsEntity* this) { - RequestPriorityDuration(NULL, 0x3c); + RequestPriorityDuration(NULL, 60); if (gFadeControl.active == 0) { super->action = 5; this->unk_68 = 0x1a4; @@ -141,7 +141,7 @@ void FourElements_Action5(FourElementsEntity* this) { void FourElements_Action6(FourElementsEntity* this) { RequestPriorityDuration(NULL, 10); if ((gMessage.doTextBox & 0x7f) == 0) { - SetPriorityTimer(0x5a); + SetPriorityTimer(90); gPlayerState.controlMode = 1; sub_0807DF50(); SetRoomFlag(0); diff --git a/src/object/lockedDoor.c b/src/object/lockedDoor.c index 624f02ab..71f87df5 100644 --- a/src/object/lockedDoor.c +++ b/src/object/lockedDoor.c @@ -235,7 +235,7 @@ void sub_08083658(Entity* this) { tmp = &gUnk_0811F680[this->field_0x7c.BYTES.byte2]; this->x.HALF.HI += tmp->x; this->y.HALF.HI += tmp->y; - RequestPriorityDuration(this, 0x3c); + RequestPriorityDuration(this, 60); SoundReq(SFX_10B); } diff --git a/src/object/macroBook.c b/src/object/macroBook.c index 63e3fb2a..d42f4c6d 100644 --- a/src/object/macroBook.c +++ b/src/object/macroBook.c @@ -89,7 +89,7 @@ void MacroBook_Action2(MacroBookEntity* this) { super->action = 3; super->timer = 0; InitAnimationForceUpdate(super, 3); - RequestPriorityDuration(super, 0x78); + RequestPriorityDuration(super, 120); } } diff --git a/src/object/object74.c b/src/object/object74.c index f086a754..10702c2c 100644 --- a/src/object/object74.c +++ b/src/object/object74.c @@ -52,7 +52,7 @@ void sub_08097BDC(Object74Entity* this) { if (CheckFlags(this->unk_86)) { SetPlayerControl(CONTROL_1); gPauseMenuOptions.disabled = 1; - RequestPriorityDuration(super, 0x1e); + RequestPriorityDuration(super, 30); if (sub_08097CB0(this) == FALSE) { sub_08097CB4(this); } @@ -67,7 +67,7 @@ void sub_08097C1C(Object74Entity* this) { void sub_08097C20(Object74Entity* this) { u32 tmp; - SetPriorityTimer(0x1e); + SetPriorityTimer(30); sub_0800445C(super); CreateMagicSparkles(super->x.HALF.HI, super->y.HALF.HI, super->collisionLayer); if (--super->timer == 0) { diff --git a/src/object/object86.c b/src/object/object86.c index 44e88e88..5a2f2ac8 100644 --- a/src/object/object86.c +++ b/src/object/object86.c @@ -60,7 +60,7 @@ void sub_08099E8C(Entity* this) { if (EntityInRectRadius(this, &gPlayerEntity, 0xc, 0xc)) { if (this->subAction == 0) { sub_08099ECC(this); - RequestPriorityDuration(this, 0x1e); + RequestPriorityDuration(this, 30); } if (CheckLocalFlag(0x75)) { CreateHoleManager(0x7); diff --git a/src/object/object8E.c b/src/object/object8E.c index 717e88fa..0a7fc70f 100644 --- a/src/object/object8E.c +++ b/src/object/object8E.c @@ -36,7 +36,7 @@ void Object8E(Object8EEntity* this) { void Object8E_Type0(Object8EEntity* this) { u32 tmp; - RequestPriorityDuration(super, 0x1e); + RequestPriorityDuration(super, 30); switch (super->action) { case 0: super->action = 1; @@ -110,7 +110,7 @@ void sub_0809B97C(Object8EEntity* this, u32 param_2) { void Object8E_Type1(Object8EEntity* this) { u32 tmp; - RequestPriorityDuration(super, 0x1e); + RequestPriorityDuration(super, 30); switch (super->action) { case 0: super->action = 1; @@ -231,7 +231,7 @@ void Object8E_Type2(Object8EEntity* this) { void Object8E_Type3(Object8EEntity* this) { u32 tmp; - RequestPriorityDuration(super, 0x1e); + RequestPriorityDuration(super, 30); switch (super->action) { case 0: super->action = 1; @@ -287,7 +287,7 @@ void Object8E_Type3(Object8EEntity* this) { void Object8E_Type4(Object8EEntity* this) { u32 tmp; - RequestPriorityDuration(super, 0x1e); + RequestPriorityDuration(super, 30); switch (super->action) { case 0: super->action = 1; diff --git a/src/object/objectAB.c b/src/object/objectAB.c index ce6cd1fb..8f232604 100644 --- a/src/object/objectAB.c +++ b/src/object/objectAB.c @@ -43,7 +43,7 @@ void ObjectAB_Action1(Entity* this) { void ObjectAB_Action2(Entity* this) { if (CheckRoomFlag(1)) { sub_080A0190(this); - RequestPriorityDuration(this, 0x1e); + RequestPriorityDuration(this, 30); if (EntityInRectRadius(this, &gPlayerEntity, 0x10, 0x10)) { CreateHoleManager(0x37); } diff --git a/src/object/objectBlockingStairs.c b/src/object/objectBlockingStairs.c index 68d1692c..417a3be7 100644 --- a/src/object/objectBlockingStairs.c +++ b/src/object/objectBlockingStairs.c @@ -115,7 +115,7 @@ void ObjectBlockingStairs_Action1(ObjectBlockingStairsEntity* this) { super->direction = Direction8FromAnimationState(gPlayerEntity.animationState); super->speed = 0x80; super->timer = 64; - RequestPriorityDuration(super, 0x50); + RequestPriorityDuration(super, 80); EnqueueSFX(SFX_10F); sub_08093248(this); return; diff --git a/src/object/pushableGrave.c b/src/object/pushableGrave.c index a26f8d13..c3cf2ba5 100644 --- a/src/object/pushableGrave.c +++ b/src/object/pushableGrave.c @@ -103,7 +103,7 @@ void PushableGrave_Action2(PushableGraveEntity* this) { super->action = 3; super->timer = 96; super->subtimer = 20; - RequestPriorityDuration(super, 0x60); + RequestPriorityDuration(super, 96); SoundReq(SFX_10F); } } diff --git a/src/object/pushableLever.c b/src/object/pushableLever.c index a2841631..5eddfe98 100644 --- a/src/object/pushableLever.c +++ b/src/object/pushableLever.c @@ -55,7 +55,7 @@ void PushableLever_Idle(PushableLeverEntity* this) { super->spriteOffsetY = 0; SetTile(this->tileIndex, this->tilePosition, super->collisionLayer); EnqueueSFX(SFX_16A); - RequestPriorityDuration(super, 0x1e); + RequestPriorityDuration(super, 30); if (PlayerCanBeMoved()) { gPlayerState.pushedObject = 0x90; gPlayerState.queued_action = 5; diff --git a/src/object/warpPoint.c b/src/object/warpPoint.c index f104b281..47d70538 100644 --- a/src/object/warpPoint.c +++ b/src/object/warpPoint.c @@ -56,7 +56,7 @@ void sub_0808B474(Entity* this) { gPlayerEntity.y.HALF.HI = this->y.HALF.HI; gPlayerEntity.animationState = 4; EnqueueSFX(SFX_112); - RequestPriorityDuration(this, this->subtimer + 0x10); + RequestPriorityDuration(this, this->subtimer + 16); } void sub_0808B530(Entity* this) { @@ -91,7 +91,7 @@ void sub_0808B590(Entity* this) { gPlayerEntity.y.HALF.HI = this->y.HALF.HI; gPlayerEntity.animationState = 4; gPlayerEntity.flags &= ~ENT_COLLIDE; - RequestPriorityDuration(this, this->subtimer + 0x10); + RequestPriorityDuration(this, this->subtimer + 16); SoundReq(SFX_113); } else { this->timer = 0; diff --git a/src/playerUtils.c b/src/playerUtils.c index d9fd0534..8a7a140f 100644 --- a/src/playerUtils.c +++ b/src/playerUtils.c @@ -235,7 +235,7 @@ bool32 sub_080777A0(void) { if ((gArea.unk1A == 0) && ((gPlayerState.flags & PL_MINISH) != 0)) { gPlayerEntity.subAction += 1; gPlayerEntity.flags &= ~ENT_COLLIDE; - RequestPriorityDuration(&gPlayerEntity, 0xb4); + RequestPriorityDuration(&gPlayerEntity, 180); return TRUE; } return FALSE;