diff options
| author | Elliptic Ellipsis <elliptic.ellipsis@gmail.com> | 2022-06-21 23:26:53 +0100 |
|---|---|---|
| committer | Elliptic Ellipsis <elliptic.ellipsis@gmail.com> | 2022-06-21 23:26:53 +0100 |
| commit | ca06566e2f5ad17936951eacb08a6b6d919736fb (patch) | |
| tree | 1f21efd54163c135f5c01401e79132ea76737c41 /src/manager | |
| parent | 0e60387579b44e5e248a2326c7c089863a1675bc (diff) | |
Many more timers -> dec
Diffstat (limited to 'src/manager')
| -rw-r--r-- | src/manager/angryStatueManager.c | 2 | ||||
| -rw-r--r-- | src/manager/cameraTargetManager.c | 2 | ||||
| -rw-r--r-- | src/manager/enterRoomTextboxManager.c | 4 | ||||
| -rw-r--r-- | src/manager/floatingPlatformManager.c | 2 | ||||
| -rw-r--r-- | src/manager/lightLevelSetManager.c | 8 | ||||
| -rw-r--r-- | src/manager/secretManager.c | 4 | ||||
| -rw-r--r-- | src/manager/vaati3StartManager.c | 4 | ||||
| -rw-r--r-- | src/manager/vaatiAppearingManager.c | 2 |
8 files changed, 14 insertions, 14 deletions
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: |
