summaryrefslogtreecommitdiff
path: root/src/manager
diff options
context:
space:
mode:
authorElliptic Ellipsis <elliptic.ellipsis@gmail.com>2022-06-21 23:32:13 +0100
committerElliptic Ellipsis <elliptic.ellipsis@gmail.com>2022-06-21 23:32:13 +0100
commit66fb42033db0e282339dd0bdb485dde0d1d4c26a (patch)
treeca31c5c86e120442e5b52a34dc2988b594fb1c74 /src/manager
parentca06566e2f5ad17936951eacb08a6b6d919736fb (diff)
Even more
Diffstat (limited to 'src/manager')
-rw-r--r--src/manager/angryStatueManager.c2
-rw-r--r--src/manager/miscManager.c2
-rw-r--r--src/manager/rollingBarrelManager.c2
-rw-r--r--src/manager/templeOfDropletsManager.c4
-rw-r--r--src/manager/tilePuzzleManager.c2
-rw-r--r--src/manager/vaatiAppearingManager.c4
6 files changed, 8 insertions, 8 deletions
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;