mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-19 22:02:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Many more timers -> dec

Browse Source
This commit is contained in:
Elliptic Ellipsis
2022-06-21 23:26:53 +01:00
parent 0e60387579
commit ca06566e2f
87 changed files with 222 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/armos.c
+2 -2
View File
@@ -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;
}
}
src/enemy/bombPeahat.c
+2 -2
View File
@@ -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);
}
src/enemy/bowMoblin.c
+1 -1
View File
@@ -225,7 +225,7 @@ void sub_0803C400(BowMoblinEntity* this) {
break;
case 24:
super->timer = 0;
super->subtimer = 0x20;
super->subtimer = 32;
break;
}
src/enemy/businessScrub.c
+1 -1
View File
@@ -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:
src/enemy/gleerok.c
+1 -1
View File
@@ -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;
src/enemy/gyorgFemale.c
+5 -5
View File
@@ -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
src/enemy/keaton.c
+1 -1
View File
@@ -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 {
src/enemy/mazaalBracelet.c
+1 -1
View File
@@ -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:
src/enemy/octorokBoss.c
+13 -13
View File
@@ -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;
}
}
}
src/enemy/octorokGolden.c
+1 -1
View File
@@ -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 {
src/enemy/puffstool.c
+4 -4
View File
@@ -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;
src/enemy/rope.c
+1 -1
View File
@@ -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);
}
src/enemy/rupeeLike.c
+1 -1
View File
@@ -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;
src/enemy/spark.c
+3 -3
View File
@@ -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) {
src/enemy/spearMoblin.c
+1 -1
View File
@@ -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);
src/enemy/spikedBeetle.c
+5 -5
View File
@@ -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);
}
src/enemy/spinyBeetle.c
+3 -3
View File
@@ -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;
src/enemy/spinyChuchu.c
+2 -2
View File
@@ -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;
src/enemy/stalfos.c
+1 -1
View File
@@ -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;
src/enemy/vaatiArm.c
+13 -13
View File
@@ -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;
src/enemy/vaatiWrath.c
+10 -10
View File
@@ -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 {
src/enemy/vaatiWrathEye.c
+4 -4
View File
@@ -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;
src/enemy/wallMaster.c
+2 -2
View File
@@ -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;