falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Should be the rest of them

This commit is contained in:
Elliptic Ellipsis 2022-06-22 00:00:57 +01:00
parent 66fb42033d
commit 69568e03b0
94 changed files with 213 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/enemy/cloudPiranha.c
View File

@ -133,7 +133,7 @@ void sub_080385CC(CloudPiranhaEntity* this) {
sub_080387F0(this);
if (sub_0803872C(this, 0x60)) {
super->action = 3;
super->subtimer = 0xc;
super->subtimer = 12;
super->speed = 0x80;
super->animationState = sub_0806FCAC(super, super->child);
super->direction = super->animationState << 2;
@ -182,7 +182,7 @@ void CloudPiranha_Action4(CloudPiranhaEntity* this) {
super->action = 1;
super->hitType = 0x72;
super->timer = 1;
super->subtimer = 0x80;
super->subtimer = 128;
super->speed = 0x80;
super->spritePriority.b1 = 2;
EnqueueSFX(SFX_124);

4
src/enemy/gleerok.c
View File

@ -148,7 +148,7 @@ void sub_0802D170(GleerokEntity* this) {
} else {
super->action = 3;
this->unk_80 = 0;
((Entity*)this->unk_84)->parent->timer = 0x18;
((Entity*)this->unk_84)->parent->timer = 24;
this->unk_84->filler[0x19] = 0;
}
}
@ -161,7 +161,7 @@ void sub_0802D218(GleerokEntity* this) {
super->timer = 0;
super->subtimer = 0;
this->unk_7c.HALF_U.LO = 0xb4;
((Entity*)(this->unk_84))->parent->timer = 0xc;
((Entity*)(this->unk_84))->parent->timer = 12;
CreateObjectWithParent(super, 0x67, 0x2, this->unk_7c.HALF_U.LO);
}

2
src/enemy/gyorgMale.c
View File

@ -410,7 +410,7 @@ void sub_08046EF4(GyorgMaleEntity* this) {
super->speed = gUnk_080D1B74[(super->timer >> 3) & 0xF];
if (--super->subtimer == 0) {
Entity* tmp;
super->subtimer = (Random() & 0x38) + 0x78;
super->subtimer = (Random() & 0x38) + 120;
tmp = CreateProjectile(GYORG_MALE_ENERGY_PROJECTILE);
if (tmp) {
tmp->collisionLayer = 2;

2
src/enemy/helmasaur.c
View File

@ -170,7 +170,7 @@ void sub_0802BDE0(Entity* this) {
this->field_0x78.HALF.HI = 0xff;
} else {
this->action = 1;
this->timer = (Random() & 0xf) + 0xf;
this->timer = (Random() & 0xf) + 15;
this->field_0x78.HALF.HI = this->direction;
}
}

2
src/enemy/keese.c
View File

@ -152,7 +152,7 @@ void Keese_StartFly(KeeseEntity* this) {
};
super->action = KEESE_ACTION_FLY;
this->flyTimer = gKeeseFlyDurations[Random() & 0xf];
this->flyTimer = gKeeseFlyDurations[Random() & 0xF];
this->sleepTimer = 60;
InitializeAnimation(super, KeeseAnimation_Fly);
}

2
src/enemy/likeLike.c
View File

@ -231,7 +231,7 @@ NONMATCH("asm/non_matching/likeLike/sub_0802810C.inc", void sub_0802810C(Entity*
END_NONMATCH
void sub_080281A0(Entity* this) {
this->subtimer = 0x19;
this->subtimer = 25;
if (sub_080281E0(ITEM_MIRROR_SHIELD)) {
this->field_0x80.HALF.LO = ITEM_MIRROR_SHIELD;
MessageFromTarget(TEXT_INDEX(TEXT_ITEM_GET, 0x78));

2
src/enemy/madderpillar.c
View File

@ -471,7 +471,7 @@ void sub_0802A0F8(Entity* this) {
} else {
this->parent->flags &= ~ENT_COLLIDE;
this->parent->health = 0;
this->parent->subtimer = 0x69;
this->parent->subtimer = 105;
}
}

2
src/enemy/miniSlime.c
View File

@ -88,7 +88,7 @@ void sub_080452FC(Entity* this) {
this->action = 3;
this->timer = 1;
if (0 < this->speed)
this->timer = FixedDiv(0x1000, this->speed) >> 0x8;
this->timer = FixedDiv(0x1000, this->speed) >> 8;
if (sub_08049FA0(this) == 0 && (Random() & 3)) {
cVar2 = sub_08049EE4(this);

2
src/enemy/mulldozer.c
View File

@ -270,7 +270,7 @@ void sub_080330C0(MulldozerEntity* this) {
super->action = 2;
this->unk_80 = 0;
if (super->type == 0) {
super->timer = (Random() & 0x38) + 0x18;
super->timer = (Random() & 0x38) + 24;
} else {
super->timer = 6;
}

4
src/enemy/octorokBoss.c
View File

@ -652,7 +652,7 @@ void OctorokBoss_Action1_ChargeAttack(OctorokBossEntity* this) {
super->knockbackDuration = 0x20;
super->knockbackSpeed = 0x200;
super->knockbackDirection = super->direction ^ 0x10;
this->heap->fallingStonesTimer += 0x3c;
this->heap->fallingStonesTimer += 60;
OctorokBoss_SetAttackTimer(this);
InitScreenShake(60, 0);
SoundReq(SFX_158);
@ -936,7 +936,7 @@ void OctorokBoss_Burning_SubAction1(OctorokBossEntity* this) {
super->knockbackDuration = 0x18;
super->knockbackSpeed = 0x200;
super->knockbackDirection = super->direction ^ 0x10;
this->heap->fallingStonesTimer += 0x1e;
this->heap->fallingStonesTimer += 30;
InitScreenShake(30, 0);
SoundReq(SFX_158);
SoundReq(SFX_14C);

2
src/enemy/rope.c
View File

@ -114,7 +114,7 @@ void sub_08031480(Entity* this) {
} else {
if (GravityUpdate(this, Q_8_8(24.0)) == 0) {
this->action = 2;
this->subtimer = 0xf;
this->subtimer = 15;
this->spriteSettings.draw = 1;
UpdateSpriteForCollisionLayer(this);
EnqueueSFX(SFX_WATER_SPLASH);

2
src/enemy/smallPesto.c
View File

@ -87,7 +87,7 @@ void sub_08031704(Entity* this) {
void sub_08031714(Entity* this) {
sub_080317B4(this);
if (--this->subtimer == 0) {
this->subtimer = (Random() & 0xf) + 0x10;
this->subtimer = (Random() & 0xf) + 16;
if (sub_08049FA0(this) == 0 && (this->subtimer & 1) != 0) {
this->direction = sub_08049EE4(this);
} else {

6
src/enemy/spearMoblin.c
View File

@ -173,7 +173,7 @@ void sub_08028488(Entity* this) {
case 2:
this->action = 2;
this->speed = 0;
this->timer = (Random() & 7) * 3 + 0x40;
this->timer = (Random() & 7) * 3 + 64;
break;
case 4:
this->direction = (this->direction + 0x10) & 0x18;
@ -256,13 +256,13 @@ NONMATCH("asm/non_matching/spearMoblin/sub_08028604.inc", void sub_08028604(Enti
uVar1 = gUnk_080CC7C0[Random() & 0xf];
} else {
uVar1 = gUnk_080CC7C0[Random() & 7];
this->timer = this->timer + 0x10;
this->timer = this->timer + 16;
this->field_0x82.HALF.HI--;
}
this->direction = iVar3 + uVar1 + (4U & 0x18);
}
} else {
this->timer = 0xc;
this->timer = 12;
this->speed = 0;
}

4
src/enemy/spinyBeetle.c
View File

@ -51,7 +51,7 @@ void SpinyBeetle_OnCollision(SpinyBeetleEntity* this) {
if ((super->contactFlags & 0x3f) == 0x14 && super->action != 5) {
super->action = 3;
super->timer = 0x5a;
super->timer = 90;
super->subtimer = 16;
super->spritePriority.b1 = 1;
super->direction = DirectionRoundUp(sub_08049F84(super, 1));
@ -294,7 +294,7 @@ void sub_08033C94(SpinyBeetleEntity* this) {
if (--super->timer)
return;
super->timer = (Random() & 0x1f) + 0x20;
super->timer = (Random() & 0x1f) + 32;
super->direction = sub_08049F84(super, 1) + 0x14;
switch (Random() & 3) {
case 1:

13
src/enemy/stalfos.c
View File

@ -176,7 +176,8 @@ void Stalfos_Init(StalfosEntity* this) {
void Stalfos_Action1(StalfosEntity* this) {
if (GravityUpdate(super, Q_8_8(24.0)) == 0 && sub_08039758(this) == 0 && --this->unk_78 == 0) {
super->action = 2;
super->timer = 10; sub_08039858(this);
super->timer = 10;
sub_08039858(this);
}
}
@ -214,20 +215,20 @@ void Stalfos_Action5(StalfosEntity* this) {
GravityUpdate(super, Q_8_8(24.0));
if (super->zVelocity < 0) {
super->action = 6;
super->timer = 0x0f;
super->timer = 15;
}
}
void Stalfos_Action6(StalfosEntity* this) {
u16 tmp;
if (super->timer != 0) {
super->timer--;
} else {
tmp = super->z.HALF.HI += 4;
u16 tmp = super->z.HALF.HI += 4;
if (-1 < (tmp * 0x10000)) {
super->action = 7;
super->timer = 10; super->z.HALF.HI = 0;
super->timer = 10;
super->z.HALF.HI = 0;
this->unk_7a = 0x78;
this->unk_7c = 0x3c;
sub_080399C4(this);

6
src/enemy/takkuri.c
View File

@ -183,7 +183,7 @@ void sub_0803BDD8(TakkuriEntity* this) {
COLLISION_ON(super);
super->action = 2;
this->unk_0x84 = 1;
super->timer = 0x18;
super->timer = 24;
this->unk_0x82 = 0x12c;
super->speed = 0x12c + 0x94;
this->unk_0x81 = 4;
@ -199,7 +199,7 @@ void sub_0803BE7C(TakkuriEntity* this) {
super->action = 1;
super->spriteSettings.draw = 1;
COLLISION_OFF(super);
super->timer = 0x8;
super->timer = 8;
super->subtimer = 1;
super->direction = sub_08049F84(super, 1);
this->unk_0x80 = 0;
@ -246,7 +246,7 @@ void sub_0803BF70(TakkuriEntity* this) {
}
if (--super->timer == 0) {
this->unk_0x84 = 1;
super->timer = 0x18;
super->timer = 24;
COLLISION_ON(super);
this->unk_0x81 = 2;
sub_0803BF2C(this);

6
src/enemy/tektite.c
View File

@ -59,7 +59,7 @@ void Tektite_OnCollision(Entity* this) {
this->action = 1;
this->subAction = 0;
if (this->type != 0) {
this->timer = 0xc0;
this->timer = 192;
} else {
this->timer = gUnk_080CDEF8[Random() & 3];
}
@ -98,7 +98,7 @@ void sub_0802F210(Entity* this) {
this->action = 1;
this->subAction = 0;
this->timer = gUnk_080CDEF8[Random() & 3];
this->timer = (Random() & 0x1f) + this->timer;
this->timer += (Random() & 0x1f);
this->subtimer = 0;
*(u8*)&this->field_0x7c = 0;
@ -149,7 +149,7 @@ void sub_0802F300(Entity* this) {
}
if (rand == 0) {
this->timer = 0xc0;
this->timer = 192;
} else {
this->timer = gUnk_080CDEF8[rand & 3] + rand;
}

10
src/enemy/tektiteGolden.c
View File

@ -50,7 +50,7 @@ void TektiteGolden_OnCollision(Entity* this) {
if (this->contactFlags == 0x94) {
this->action = 1;
this->subAction = 0;
this->timer = 0x14;
this->timer = 20;
this->subtimer = 0;
this->field_0x80.HALF.LO = 0;
if (this->z.HALF.HI != 0) {
@ -92,7 +92,7 @@ void sub_08037FA0(Entity* this) {
sub_0804A720(this);
this->action = 1;
this->subAction = 0;
this->timer = (Random() & 0x1f) + 0x20;
this->timer = (Random() & 0x1f) + 32;
this->subtimer = 0;
this->field_0x80.HALF.LO = 0;
InitializeAnimation(this, 0);
@ -129,7 +129,7 @@ void sub_08038048(Entity* this) {
if (sub_080044EC(this, 0x3000) == 1) {
this->action = 3;
this->subAction = 0;
this->timer = 0x14;
this->timer = 20;
InitializeAnimation(this, 3);
return;
} else if (this->collisions != COL_NONE) {
@ -139,7 +139,7 @@ void sub_08038048(Entity* this) {
}
if (--this->timer == 0) {
this->timer = rand + 0x10;
this->timer = rand + 16;
sub_08038168(this);
}
@ -169,7 +169,7 @@ void sub_08038110(Entity* this) {
} else {
this->action = 1;
this->field_0x80.HALF.LO = 0;
this->timer = 0xc0;
this->timer = 192;
InitializeAnimation(this, 0);
}
}

8
src/enemy/vaatiArm.c
View File

@ -269,7 +269,7 @@ static void sub_08042654(Entity* this) {
if ((((VaatiArm_HeapStruct*)this->myHeap)->s1[4].unk0c += 2) < 0x1c)
break;
this->subAction = 5;
this->timer = 0x5a;
this->timer = 90;
((VaatiArm_HeapStruct*)this->myHeap)->entities[0]->flags |= ENT_COLLIDE;
((VaatiArm_HeapStruct*)this->myHeap)->entities[0]->spritePriority.b0 = 4;
((VaatiArm_HeapStruct*)this->myHeap)->entities[1]->flags |= ENT_COLLIDE;
@ -640,7 +640,7 @@ static void sub_08042E30(Entity* this) {
pVVar9 = &((VaatiArm_HeapStruct*)this->myHeap)->s1[0];
if (--this->timer == 0) {
this->subAction = 4;
this->timer = (Random() & 0x38) + 0x28;
this->timer = (Random() & 0x38) + 40;
this->speed = 0x200;
this->direction = pVVar9->unk00.HALF.HI >> 3;
uVar6 = CalculateDirectionTo(this->x.HALF.HI, this->y.HALF.HI, gRoomControls.origin_x + 0x110,
@ -674,7 +674,7 @@ static void sub_08042EF4(Entity* this) {
if (--this->timer == 0) {
if (EntityWithinDistance(this, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI, 0x50)) {
this->subAction = 6;
this->timer = 0x28;
this->timer = 40;
} else {
this->subAction = 5;
InitAnimationForceUpdate(this, 0xf);
@ -1059,7 +1059,7 @@ static void sub_08043698(Entity* this) {
static inline void deleteThing(Entity* this, const u32 index) {
if (--this->timer == 0) {
this->timer = 0x14;
this->timer = 20;
this->subAction = index + 1;
if (index == 1) {
this->spriteSettings.draw = 0;

4
src/enemy/vaatiProjectile.c
View File

@ -156,7 +156,7 @@ void VaatiProjectileFunction0Action3(Entity* this) {
if (this->child->frame & ANIM_DONE) {
if (--this->z.HALF.HI <= -0x18) {
this->action = 4;
this->timer = (Random() & 0xf) + 0xf;
this->timer = (Random() & 0xf) + 15;
InitializeAnimation(this->child, 1);
}
GetNextFrame(this);
@ -180,7 +180,7 @@ void VaatiProjectileFunction0Action5(Entity* this) {
return;
}
this->action = 6;
this->timer = 0x14;
this->timer = 20;
}
}

14
src/enemy/vaatiRebornEnemy.c
View File

@ -164,7 +164,7 @@ void VaatiRebornEnemyType0Action1(Entity* this) {
this->action = 3;
this->field_0x74.HALF.HI = this->field_0x74.HALF.LO & 0x80;
this->field_0x74.HALF.LO = 0;
this->timer = 0xc0;
this->timer = 192;
this->direction = 0xff;
this->spriteSettings.draw = 1;
InitAnimationForceUpdate(this, 0);
@ -175,7 +175,7 @@ void VaatiRebornEnemyType0Action1(Entity* this) {
switch (sub_0803DEE0(this)) {
case 0:
this->action = 4;
this->timer = 0xa0;
this->timer = 160;
this->direction = 0xff;
this->cutsceneBeh.HALF.LO = 0xff;
InitAnimationForceUpdate(this, 1);
@ -384,7 +384,7 @@ void VaatiRebornEnemyType0Action5(Entity* this) {
case 1:
if ((this->frame & 0x10) != 0) {
this->field_0x74.HALF.LO = 2;
this->subtimer = (Random() & 0x3f) + 0x40;
this->subtimer = (Random() & 0x3f) + 64;
SoundReq(SFX_SUMMON);
}
break;
@ -392,7 +392,7 @@ void VaatiRebornEnemyType0Action5(Entity* this) {
if (--this->subtimer == 0) {
if (!((this->field_0x86.HALF.LO < 2) || (3 < this->field_0x86.HALF.HI)) && (Random() & 0x10) != 0) {
this->field_0x86.HALF.HI++;
this->subtimer = (Random() & 0x3f) + 0x40;
this->subtimer = (Random() & 0x3f) + 64;
uVar3 = GetFacingDirection(this, &gPlayerEntity);
this->direction = (uVar3 & 0x10) | 8;
} else {
@ -432,7 +432,7 @@ void VaatiRebornEnemyType0Action6(Entity* this) {
case 0:
if (this->timer != 0) {
this->field_0x74.HALF.LO = 1;
this->timer = 0x70;
this->timer = 112;
}
break;
case 1:
@ -654,7 +654,7 @@ void VaatiRebornEnemyType1PreAction(Entity* this) {
COLLISION_OFF(this);
parent->action = 7;
parent->flags &= ~ENT_COLLIDE;
parent->timer = 0x80;
parent->timer = 128;
parent->spriteOffsetX = 0;
parent->direction = -1;
this->timer = 0;
@ -669,7 +669,7 @@ void VaatiRebornEnemyType1PreAction(Entity* this) {
SoundReq(SFX_BOSS_HIT);
InitScreenShake(12, 1);
if (this->timer == 0)
this->timer = 0x48;
this->timer = 72;
}
}
if (this->timer != 0) {

28
src/enemy/vaatiTransfigured.c
View File

@ -188,7 +188,7 @@ void VaatiTransfiguredType0Action1(Entity* this) {
if (--this->timer == 0) {
this->field_0x80.HALF.LO += 1;
this->speed = 0x180;
this->timer = 0x14;
this->timer = 20;
}
break;
case 1:
@ -203,7 +203,7 @@ void VaatiTransfiguredType0Action1(Entity* this) {
this->field_0x80.HALF.LO += 1;
this->speed = 0;
if (this->animationState < 2) {
this->timer = (Random() & 0x7f) + 0x40;
this->timer = (Random() & 0x7f) + 64;
} else {
this->timer = 8;
}
@ -269,7 +269,7 @@ void VaatiTransfiguredType0Action3(Entity* this) {
if (uVar4 != 1)
break;
this->field_0x80.HALF.LO = 1;
this->timer = 0xc0;
this->timer = 192;
COLLISION_ON(this);
SoundReq(SFX_14C);
InitScreenShake(20, 4);
@ -293,7 +293,7 @@ void VaatiTransfiguredType0Action3(Entity* this) {
this->animationState++;
if (this->animationState > 2) {
this->action = 7;
this->timer = 0xe0;
this->timer = 224;
DeleteClones();
SoundReq(SFX_BOSS_HIT);
return;
@ -307,7 +307,7 @@ void VaatiTransfiguredType0Action3(Entity* this) {
this->timer = 64;
} else {
this->field_0x80.HALF.LO = 4;
this->timer = 0x50;
this->timer = 80;
}
break;
case 3:
@ -378,7 +378,7 @@ void VaatiTransfiguredType0Action4(Entity* this) {
if (--this->timer == 0) {
this->field_0x80.HALF.LO += 1;
this->field_0x74.HALF.LO = 0;
this->timer = 0x80;
this->timer = 128;
this->subtimer = 0;
this->zVelocity = Q_16_16(2.25);
SoundReq(SFX_12B);
@ -416,7 +416,7 @@ void VaatiTransfiguredType0Action4(Entity* this) {
CreateProjectileWithParent(this, V2_PROJECTILE, this->subtimer);
}
if (((this->subtimer != 0) && (1 < this->animationState)) && (this->timer < 6)) {
this->timer = 0x80;
this->timer = 128;
this->subtimer = 0;
}
}
@ -447,7 +447,7 @@ void VaatiTransfiguredType0Action5(Entity* this) {
this->field_0x80.HALF.LO += 1;
this->timer = 64;
if (1 < this->animationState) {
this->timer = 0x80;
this->timer = 128;
this->subtimer = 1;
}
}
@ -498,7 +498,7 @@ void VaatiTransfiguredType0Action6(Entity* this) {
case 0:
if (--this->timer == 0) {
this->field_0x80.HALF.LO += 1;
this->timer = 0x80;
this->timer = 128;
if (1 < this->animationState) {
this->subtimer = 1;
}
@ -514,7 +514,7 @@ void VaatiTransfiguredType0Action6(Entity* this) {
CreateProjectileWithParent(this, V2_PROJECTILE, this->subtimer);
}
if (this->timer < 6) {
this->timer = 0x80;
this->timer = 128;
this->subtimer = 0;
}
} else {
@ -634,7 +634,7 @@ void VaatiTransfiguredType2Action0(Entity* this) {
sub_08040648(this, 2, 2);
this->action = 1;
this->timer = 0;
this->subtimer = (Random() & 0x7f) + 0x17;
this->subtimer = (Random() & 0x7f) + 23;
this->field_0x74.HALF.LO = 0;
InitAnimationForceUpdate(this, 0);
}
@ -667,7 +667,7 @@ void VaatiTransfiguredType2Action1(Entity* this) {
switch (this->field_0x74.HALF.LO) {
case 0:
if (--this->subtimer == 0) {
this->subtimer = (Random() & 0x7f) + 0x27;
this->subtimer = (Random() & 0x7f) + 39;
if ((this->subtimer & 1) != 0) {
this->field_0x74.HALF.LO = 1;
InitAnimationForceUpdate(this, 8);
@ -677,14 +677,14 @@ void VaatiTransfiguredType2Action1(Entity* this) {
case 1:
if ((this->frame & ANIM_DONE) != 0) {
this->field_0x74.HALF.LO = 0;
this->subtimer = (Random() & 0x7f) + 0x17;
this->subtimer = (Random() & 0x7f) + 23;
InitAnimationForceUpdate(this, 0);
}
break;
case 0x10:
InitAnimationForceUpdate(this, 7);
this->field_0x74.HALF.LO = 0x11;
this->subtimer = 0x50;
this->subtimer = 80;
break;
case 0x11:
if (--this->subtimer == 0) {

4
src/enemy/vaatiWrath.c
View File

@ -475,7 +475,7 @@ void VaatiWrathType0ActionB(Entity* this) {
GetNextFrame(((VaatiWrathHeapStruct*)this->myHeap)->type2);
if (GravityUpdate(this, Q_8_8(32.0)) == 0) {
this->subAction = 1;
this->timer = 0xf0;
this->timer = 240;
this->health = 8;
this->hitType = 0x38;
InitScreenShake(20, 0);
@ -685,7 +685,7 @@ void sub_08041E20(Entity* this) {
GetNextFrame(((VaatiWrathHeapStruct*)this->myHeap)->type2);
if (gFadeControl.active == 0) {
this->subAction = 5;
this->timer = 0x5a;
this->timer = 90;
}
}

2
src/enemy/wallMaster.c
View File

@ -74,7 +74,7 @@ void sub_0802A534(Entity* this) {
Entity* ent = sub_08049DF4(1);
if (ent != NULL) {
this->action = 2;
this->timer = 0x5a;
this->timer = 90;
COLLISION_ON(this);
this->spriteSettings.draw = 3;
this->x.HALF.HI = ent->x.HALF.HI;

2
src/enemy/wisp.c
View File

@ -73,7 +73,7 @@ void Wisp_OnCollision(Entity* this) {
ent = CreateFx(this, FX_DEATH, 0);
if (ent != NULL) {
this->child = ent;
this->timer = 0xe;
this->timer = 14;
CopyPosition(this, ent);
}
DeleteThisEntity();

18
src/enemy/wizzrobeFire.c
View File

@ -40,8 +40,8 @@ void WizzrobeFire_Init(WizzrobeEntity* this) {
super->action = 1;
this->timer2 = 0xff;
this->timer1 = 0x28;
super->timer = 0x28;
super->subtimer = 0x60;
super->timer = 40;
super->subtimer = 96;
sub_0802F888(this);
projectile = CreateProjectileWithParent(super, FIRE_PROJECTILE, 0);
if (projectile != NULL) {
@ -64,8 +64,8 @@ void WizzrobeFire_Action1(WizzrobeEntity* this) {
break;
case 0:
if (--super->timer == 0) {
this->timer2 += 1;
super->timer = 0x0e;
this->timer2++;
super->timer = 14;
super->flags |= 0x80;
}
break;
@ -92,8 +92,8 @@ void WizzrobeFire_Action2(WizzrobeEntity* this) {
case 0:
switch (--super->timer) {
case 0:
this->timer2 += 1;
super->timer = 0x38;
this->timer2++;
super->timer = 56;
super->subtimer = 0;
super->child->spriteSettings.draw = 0;
break;
@ -111,7 +111,7 @@ void WizzrobeFire_Action2(WizzrobeEntity* this) {
if (--super->timer == 0) {
this->timer2++;
this->timer1 = 0x28;
super->timer = 0x28;
super->timer = 40;
super->subtimer = 0;
super->flags &= 0x7f;
SetTile(this->tileIndex, this->tilePosition, super->collisionLayer);
@ -123,7 +123,7 @@ void WizzrobeFire_Action2(WizzrobeEntity* this) {
case 2:
if (--super->timer == 0) {
this->timer2++;
super->timer = (Random() & 0x3f) + 0x1c;
super->timer = (Random() & 0x3f) + 28;
super->spriteSettings.draw = 0;
}
break;
@ -132,7 +132,7 @@ void WizzrobeFire_Action2(WizzrobeEntity* this) {
super->action = 1;
this->timer2 = 0;
this->timer1 = 0x28;
super->timer = 0x28;
super->timer = 40;
EnqueueSFX(SFX_156);
sub_0802F8E4(this);
InitializeAnimation(super, super->direction >> 3);

14
src/enemy/wizzrobeIce.c
View File

@ -49,8 +49,8 @@ void WizzrobeIce_Init(WizzrobeEntity* this) {
super->action = 1;
this->timer2 = 0xff;
this->timer1 = 0x28;
super->timer = 0x28;
super->subtimer = 0x60;
super->timer = 40;
super->subtimer = 96;
sub_0802F888(this);
projectile = CreateProjectileWithParent(super, ICE_PROJECTILE, 0);
if (projectile != NULL) {
@ -73,7 +73,7 @@ void WizzrobeIce_Action1(WizzrobeEntity* this) {
case 0:
if (--super->timer == 0) {
this->timer2++;
super->timer = 0xc;
super->timer = 12;
super->flags |= 0x80;
}
@ -100,7 +100,7 @@ void WizzrobeIce_Action2(WizzrobeEntity* this) {
switch (--super->timer) {
case 0:
this->timer2 += 1;
super->timer = 0x38;
super->timer = 56;
super->subtimer = 0;
super->child->spriteSettings.draw = 0;
break;
@ -118,7 +118,7 @@ void WizzrobeIce_Action2(WizzrobeEntity* this) {
if (--super->timer == 0) {
this->timer2++;
this->timer1 = 0x28;
super->timer = 0x28;
super->timer = 40;
super->subtimer = 0;
super->flags &= 0x7f;
SetTile(this->tileIndex, this->tilePosition, super->collisionLayer);
@ -129,7 +129,7 @@ void WizzrobeIce_Action2(WizzrobeEntity* this) {
case 2:
if (--super->timer == 0) {
this->timer2++;
super->timer = (Random() & 0x3f) + 0x18;
super->timer = (Random() & 0x3f) + 24;
super->spriteSettings.draw = 0;
}
break;
@ -138,7 +138,7 @@ void WizzrobeIce_Action2(WizzrobeEntity* this) {
super->action = 1;
this->timer2 = 0;
this->timer1 = 0x28;
super->timer = 0x28;
super->timer = 40;
EnqueueSFX(SFX_156);
sub_0802F8E4(this);
InitializeAnimation(super, super->direction >> 3);

18
src/enemy/wizzrobeWind.c
View File

@ -65,8 +65,8 @@ void WizzrobeWind_Init(WizzrobeEntity* this) {
super->action = 1;
this->timer2 = 0xff;
this->timer1 = 0x28;
super->timer = 0x28;
super->subtimer = 0x60;
super->timer = 40;
super->subtimer = 96;
sub_0802F888(this);
}
projectile = CreateProjectileWithParent(super, WIND_PROJECTILE, 0);
@ -98,7 +98,7 @@ void WizzrobeWind_Action1(WizzrobeEntity* this) {
if (--super->timer == 0) {
super->action = 2;
this->timer2 = 0;
super->timer = 0x28;
super->timer = 40;
tmp = super->direction >> 3;
parent = super->parent;
parent->timer = 1;
@ -116,7 +116,7 @@ void WizzrobeWind_Action2(WizzrobeEntity* this) {
switch (--super->timer) {
case 0:
this->timer2++;
super->timer = 0x38;
super->timer = 56;
super->subtimer = 0;
super->parent->spriteSettings.draw = 0;
break;
@ -134,7 +134,7 @@ void WizzrobeWind_Action2(WizzrobeEntity* this) {
if (--super->timer == 0) {
this->timer2++;
this->timer1 = 0x28;
super->timer = 0x28;
super->timer = 40;
super->subtimer = 0;
super->flags &= 0x7f;
EnqueueSFX(SFX_156);
@ -145,7 +145,7 @@ void WizzrobeWind_Action2(WizzrobeEntity* this) {
case 2:
if (--super->timer == 0) {
this->timer2++;
super->timer = (Random() & 0x3f) + 0x20;
super->timer = (Random() & 0x3f) + 32;
super->spriteSettings.draw = 0;
}
break;
@ -154,7 +154,7 @@ void WizzrobeWind_Action2(WizzrobeEntity* this) {
super->action = 1;
this->timer2 = 0;
this->timer1 = 0x28;
super->timer = 0x28;
super->timer = 40;
EnqueueSFX(SFX_156);
sub_0802F8E4(this);
InitializeAnimation(super, super->direction >> 3);
@ -181,7 +181,7 @@ void WizzrobeWind_Action3(WizzrobeEntity* this) {
return;
}
this->timer2++;
super->timer = 0x28;
super->timer = 40;
parent->timer = 1;
parent->spriteSettings.draw = 1;
InitializeAnimation(super, super->animationState >> 1 | 4);
@ -189,7 +189,7 @@ void WizzrobeWind_Action3(WizzrobeEntity* this) {
case 2:
if (--super->timer == 0) {
this->timer2++;
super->timer = (Random() & 0x1f) + 0x30;
super->timer = (Random() & 0x1f) + 48;
parent->spriteSettings.draw = 0;
InitializeAnimation(super, super->animationState >> 1);
} else if (super->timer == 8) {

2
src/manager/bombableWallManager.c
View File

@ -49,7 +49,7 @@ void BombableWallManager_Init(BombableWallManager* this) {
void BombableWallManager_Action1(BombableWallManager* this) {
if (sub_080B1AE0(this->tile, this->field_0x35) != 0x2e) {
super->action = 2;
super->timer = 0x5a;
super->timer = 90;
sub_0805C02C(this);
SetLocalFlag(this->field_0x3e);
}

2
src/manager/bridgeManager.c
View File

@ -40,7 +40,7 @@ void BridgeManager_Init(BridgeManager* this) {
this->unk_2c = gUnk_08108034[tmp];
this->unk_2e = gUnk_08108034[tmp + 1];
this->unk_32 = ((super->type2 >> 2) & 0xF) + 1;
super->timer = 0x1C;
super->timer = 28;
super->subtimer = 0;
super->action = (super->type2 & 0x80) ? 2 : 1;
if (super->action != 2 || !CheckFlags(this->flags))

2
src/manager/hyruleTownBellManager.c
View File

@ -19,7 +19,7 @@ void HyruleTownBellManager_Main(HyruleTownBellManager* this) {
if (super->action == 0) {
if (x < 0x20 && y < 0x20 && gPlayerEntity.z.HALF.HI < -0x18 && gPlayerState.framestate == PL_STATE_CAPE) {
super->action++;
super->timer = 0x5a;
super->timer = 90;
SoundReq(SFX_10A);
}
} else {

2
src/manager/lightManager.c
View File

@ -62,7 +62,7 @@ void LightManager_Main(LightManager* this) {
sub_0801E154(uVar3);
this->unk20 = 0;
} else if ((gRoomTransition.frameCount & 3) == 0) {
super->subtimer += 0x10;
super->subtimer += 16;
sVar1 = gSineTable[super->subtimer];
this->unk20 = sVar1 >> 7;
sub_0801E154(uVar3 + this->unk20);

2
src/manager/rainfallManager.c
View File

@ -33,7 +33,7 @@ void RainfallManager_Action1(RainfallManager* this) {
if (--super->timer == 0) {
Entity* waterDrop;
super->timer = 0xf;
super->timer = 15;
waterDrop = CreateEnemy(WATER_DROP, 0);
if (waterDrop != NULL) {
waterDrop->x.HALF.HI = gRoomControls.scroll_x + 0x78 + gUnk_08108C6C[Random() & 7];

2
src/manager/tileChangeObserveManager.c
View File

@ -40,7 +40,7 @@ void TileChangeObserveManager_Init(TileChangeObserveManager* this) {
void TileChangeObserveManager_Action1(TileChangeObserveManager* this) {
if (this->initialTile != this->observedTile[0]) {
super->action++;
super->timer = 0xf;
super->timer = 15;
}
}

2
src/manager/vaatiAppearingManager.c
View File

@ -117,7 +117,7 @@ void VaatiAppearingManager_Action2(VaatiAppearingManager* this) {
case 1:
if (--super->timer == 0) {
super->subAction = 2;
super->timer = 0x14;
super->timer = 20;
}
break;
case 2:

4
src/menu/kinstone_menu.c
View File

@ -255,7 +255,7 @@ void KinstoneMenu_Type3_Overlay1(void) {
SetMenuType(4);
} else {
gMenu.overlayType = 2;
gMenu.transitionTimer = 0x14;
gMenu.transitionTimer = 20;
gScreen.lcd.displayControl |= 0x2000;
gScreen.controls.window0HorizontalDimensions = 0x6887;
gScreen.controls.window0VerticalDimensions = 0x405f;
@ -331,7 +331,7 @@ void KinstoneMenu_Type5_Overlay2(void) {
} else {
gMenu.column_idx = 6;
gMenu.overlayType = 3;
gMenu.transitionTimer = 0x4f;
gMenu.transitionTimer = 79;
CreateObject(OBJECT_B3, 1, 0);
SoundReq(SFX_1CA);
}

2
src/npc/bigGoron.c
View File

@ -190,7 +190,7 @@ void sub_0806D1D0(Entity* this) {
case 0:
default:
if (--this->timer == 0) {
this->timer = (Random() & 0x7f) + 0x30;
this->timer = (Random() & 0x7f) + 48;
this->subtimer = 8;
this->frameIndex = 1;
}

4
src/npc/cat.c
View File

@ -229,7 +229,7 @@ void sub_08067A0C(Entity* this) {
if (this->frame & ANIM_DONE) {
if (sub_08067D20(this) != 0) {
sub_08067B80(this, 5);
this->timer = this->timer + 0x14;
this->timer += 20;
} else {
sub_08067C24(this);
}
@ -303,7 +303,7 @@ void sub_08067B70(Entity* this) {
void sub_08067B80(Entity* this, u32 param) {
this->action = 5;
this->timer = 0x14;
this->timer = 20;
this->field_0x74.HALF.LO = (Random() & 0x7f) + 0x1e;
InitAnimationForceUpdate(this, param);
sub_08067DDC(this);

2
src/npc/cow.c
View File

@ -91,7 +91,7 @@ void sub_08069068(Entity* ent) {
ent->animationState = anim;
ent->direction = anim <<= 3;
ent->subtimer = (Random() & 0x3F) + 0x3C;
ent->subtimer = (Random() & 0x3F) + 60;
InitAnimationForceUpdate(ent, ent->animationState + 4);
}

2
src/npc/cucco.c
View File

@ -25,7 +25,7 @@ void Cucco_Init(Entity* this) {
void sub_0806E4EC(Entity* this) {
if (this->subAction == 0) {
this->subAction += 1;
this->timer = (Random() & 0x1f) + 0x3c;
this->timer = (Random() & 0x1f) + 60;
InitAnimationForceUpdate(this, 0);
}
if (--this->timer == 0) {

2
src/npc/cuccoChick.c
View File

@ -33,7 +33,7 @@ void CuccoChick_Init(Entity* this) {
void sub_0806E764(Entity* this) {
if (this->subAction == 0) {
this->subAction += 1;
this->timer = (Random() & 0x1f) + 0x1e;
this->timer = (Random() & 0x1f) + 30;
this->frameIndex = 0;
}
if (--this->timer == 0) {

6
src/npc/dog.c
View File

@ -95,7 +95,7 @@ void sub_08069C40(Entity* this) {
this->timer -= 1;
if (this->timer == 0) {
this->action = 2;
this->timer = (Random() & 0x1f) + 0x1e;
this->timer = (Random() & 0x1f) + 30;
this->direction = gUnk_08111DA8[Random() & 7];
sub_08069F6C(this);
}
@ -166,7 +166,7 @@ void sub_08069D54(Entity* this) {
} else {
this->action = 3;
}
this->timer = (Random() & 0x1f) + 0x1e;
this->timer = (Random() & 0x1f) + 30;
}
void sub_08069DF8(Entity* this) {
@ -185,7 +185,7 @@ void sub_08069DF8(Entity* this) {
this->action = 3;
}
}
this->timer = (Random() & 0x1f) + 0x1e;
this->timer = (Random() & 0x1f) + 30;
}
void sub_08069E44(Entity* this) {

4
src/npc/kid.c
View File

@ -53,7 +53,7 @@ void sub_08062130(Entity* this) {
this->subtimer = 0;
this->timer = (this->timer + 1) & 7;
if (this->type == 6) {
this->timer = this->timer + 0x10;
this->timer = this->timer + 16;
}
InitAnimationForceUpdate(this, this->timer);
} else {
@ -213,7 +213,7 @@ void sub_08062698(Entity* this) {
}
void sub_080626AC(Entity* this) {
this->timer = (Random() & 0x1f) + 0x40;
this->timer = (Random() & 0x1f) + 64;
}
void sub_080626C0(Entity* this, ScriptExecutionContext* context) {

6
src/npc/npc5.c
View File

@ -553,7 +553,7 @@ void sub_08061358(Entity* this) {
return;
}
this->subAction = 1;
this->timer = 0xf;
this->timer = 15;
sub_08060E70(this, 0);
break;
case 1:
@ -565,7 +565,7 @@ void sub_08061358(Entity* this) {
bVar4 = uVar2;
if ((uVar2 & 1) == 0) {
this->subAction = 3;
this->timer = (bVar4 & 0x18) + 0x1e;
this->timer = (bVar4 & 0x18) + 30;
sub_08060E70(this, 4);
return;
}
@ -580,7 +580,7 @@ void sub_08061358(Entity* this) {
this->animationState = ((this->frame & 0x18) >> 2);
if ((Random() & 1)) {
this->subAction = 3;
this->timer = (bVar4 & 0x18) + 0x1e;
this->timer = (bVar4 & 0x18) + 30;
sub_08060E70(this, 4);
return;
}

2
src/npc/postman.c
View File

@ -33,7 +33,7 @@ void Postman(Entity* this) {
void sub_08060428(Entity* this) {
void* data;
this->timer = 0x5a;
this->timer = 90;
this->speed = 0x180;
if (this->type2 != 0) {
data = GetCurrentRoomProperty(this->type2);

4
src/npc/rem.c
View File

@ -166,11 +166,11 @@ void sub_0806A5E8(Entity* this) {
if (this->action == 0) {
this->action = 1;
InitializeAnimation(this, 0x10);
this->timer = (Random() & 0x3f) + 0x3c;
this->timer = (Random() & 0x3f) + 60;
}
this->timer -= 1;
if (this->timer == 0) {
this->timer = (Random() & 0x3f) + 0x78;
this->timer = (Random() & 0x3f) + 120;
SoundReq(SFX_REM_SLEEP);
}
GetNextFrame(this);

2
src/npc/vaatiReborn.c
View File

@ -32,7 +32,7 @@ void VaatiRebornAction0(Entity* this) {
switch (this->type) {
case 0:
this->y.HALF.HI -= 0xa0;
this->timer = 0xa0;
this->timer = 160;
this->subtimer = 32;
this->spriteOffsetY = 0x20;
for (i = 0; i < 4; i++) {

2
src/object/beanstalk.c
View File

@ -319,7 +319,7 @@ void Beanstalk_Action1Type8SubAction0(BeanstalkEntity* this) {
obj->spriteVramOffset = super->spriteVramOffset;
obj->palette.b.b0 = super->palette.b.b0;
obj->animIndex = 2;
obj->timer = 0x80;
obj->timer = 128;
obj->type = 1;
obj->spriteRendering.b3 = 2;
obj->spritePriority.b0 = 6;

2
src/object/bird.c
View File

@ -46,7 +46,7 @@ void Bird_Type0_Init(Entity* this) {
this->action++;
this->spriteSettings.draw = TRUE;
this->timer = 0x31;
this->timer = 49;
this->subtimer = 1;
this->zVelocity = Q_16_16(-1.5);
this->z.WORD = Q_16_16(-56.75);

4
src/object/bossDoor.c
View File

@ -120,7 +120,7 @@ void BossDoor_Action4(BossDoorEntity* this) {
if (sub_08083734(super, this->unk_76)) {
super->action = 5;
super->timer = 0xc;
super->timer = 12;
super->spriteSettings.draw = 1;
super->direction = *(u8*)&this->unk_76 << 3 ^ 0x10;
ptr = &gUnk_081214F4[this->unk_76 * 2];
@ -166,7 +166,7 @@ void sub_0808C4BC(BossDoorEntity* this) {
static const s8 gUnk_0812150C[] = { 0, -2, 2, 0, 0, 2, -2, 0 };
const s8* ptr;
super->action = 3;
super->timer = 0xc;
super->timer = 12;
super->direction = this->unk_76 * 8;
ptr = &gUnk_0812150C[this->unk_76 * 2];
super->x.HALF.HI += ptr[0];

7
src/object/button.c
View File

@ -52,7 +52,8 @@ void sub_08081FF8(Entity*);
void sub_08081BAC(Entity* this) {
if (sub_08081CB0(this)) {
this->subAction = 0;
this->timer = 10; RequestPriorityDuration(this, 0xA);
this->timer = 10;
RequestPriorityDuration(this, 0xA);
sub_08081FF8(this);
if (this->type == 1) {
this->action = 3;
@ -73,9 +74,9 @@ void sub_08081BE0(Entity* this) {
this->action = 4;
this->subtimer = 1;
if ((gPlayerState.heldObject == 2) || (!(gPlayerState.field_0x35 & 0x80))) {
this->timer = 0x18;
this->timer = 24;
} else {
this->timer = 0x8;
this->timer = 8;
}
} else {
sub_08081E6C(this);

12
src/object/crenelBeanSprout.c
View File

@ -247,7 +247,7 @@ void CrenelBeanSprout_Action4(CrenelBeanSproutEntity* this) {
CreateDust(super);
}
} else {
super->timer = 0xc0;
super->timer = 192;
}
}
@ -274,12 +274,10 @@ void CrenelBeanSprout_Action6(CrenelBeanSproutEntity* this) {
}
void CrenelBeanSprout_Action6SubAction0(CrenelBeanSproutEntity* this) {
static const u8 gUnk_081231AC[] = {
2,
3,
};
static const u8 gUnk_081231AC[] = { 2, 3 };
SetLocalFlag(super->type2);
super->timer = 0x0f;
super->timer = 15;
super->subtimer = gUnk_081231AC[super->type >> 1];
super->type2 = 0;
super->spriteSettings.draw = 0;
@ -303,7 +301,7 @@ void CrenelBeanSprout_Action6SubAction1(CrenelBeanSproutEntity* this) {
super->subAction++;
super->timer = 60;
} else {
super->timer = 0x0f;
super->timer = 15;
}
}
}

6
src/object/ezloCap.c
View File

@ -73,7 +73,8 @@ void EzloCap_Type0Init(EzloCapEntity* this) {
SoundReq(SFX_F3);
} else {
super->timer = 0;
super->subtimer = 10; super->y.HALF.HI -= 0xe;
super->subtimer = 10;
super->y.HALF.HI -= 0xe;
InitAnimationForceUpdate(super, 0x14);
}
}
@ -128,7 +129,8 @@ void EzloCap_Type1Action1(EzloCapEntity* this) {
if (super->subAction == 0) {
if (super->subtimer-- == 0) {
super->timer++;
super->subtimer = 10; tmp = super->timer - 1;
super->subtimer = 10;
tmp = super->timer - 1;
obj = CreateObjectWithParent(super, OBJECT_79, tmp, 0);
super->child = obj;
if (obj != NULL) {

2
src/object/fairy.c
View File

@ -240,7 +240,7 @@ void sub_0808DAD0(FairyEntity* this) {
DeleteThisEntity();
}
super->action = 4;
super->timer = 0x80;
super->timer = 128;
super->subtimer = 6;
super->flags &= ~ENT_COLLIDE;
super->spriteSettings.draw = 1;

4
src/object/figurineDevice.c
View File

@ -199,7 +199,7 @@ void FigurineDevice_Action3(FigurineDeviceEntity* this) {
case 0:
if ((super->frame & ANIM_DONE) != 0) {
this->unk_7a = 1;
super->timer = 0x28;
super->timer = 40;
ChangeObjPalette(super, gUnk_08120AA8[super->type2]);
InitializeAnimation(super, 2);
SoundReq(SFX_110);
@ -323,7 +323,7 @@ ASM_FUNC("asm/non_matching/figurineDevice/sub_08087F94.inc", void sub_08087F94(F
void sub_08088034(FigurineDeviceEntity* this) {
if (super->timer == 0) {
super->timer = 0x14;
super->timer = 20;
SoundReq(SFX_MENU_ERROR);
}
}

12
src/object/gyorgBossObject.c
View File

@ -63,7 +63,7 @@ void GyorgBossObject_SetupStart(GyorgBossObjectEntity* this) {
return;
super->action = 1;
super->myHeap = heap;
this->timer = 0x258;
this->timer = 600;
this->unk_6c = 0;
heap->boss = this;
tmp = CreateEnemy(GYORG_FEMALE, 0);
@ -120,7 +120,7 @@ void GyorgBossObject_FemalePhase1(GyorgBossObjectEntity* this) {
if (((GyorgHeap*)super->myHeap)->female->base.health == 0) {
// start male phase 1
super->action = 3;
super->timer = 0x23;
super->timer = 35;
this->unk_6c = 1;
this->unk_78 = 0x400;
this->unk_7b = 1;
@ -156,7 +156,7 @@ void GyorgBossObject_FemalePhase2(GyorgBossObjectEntity* this) {
// start male phase 2
((GyorgHeap*)super->myHeap)->male1->base.health = 12;
super->action = 5;
super->timer = 0x23;
super->timer = 35;
this->unk_6c = 2;
this->unk_78 = 0x400;
this->unk_7b = 1;
@ -191,7 +191,7 @@ void GyorgBossObject_FemalePhase3(GyorgBossObjectEntity* this) {
// start male phase 3
((GyorgHeap*)super->myHeap)->male2->base.health = 12;
super->action = 7;
super->timer = 0x23;
super->timer = 35;
this->unk_6c = 0x104;
this->unk_78 = 0x400;
SoundReq(SFX_BOSS_DIE);
@ -228,8 +228,8 @@ void GyorgBossObject_FemalePhase4(GyorgBossObjectEntity* this) {
if (PlayerCanBeMoved() && gPlayerEntity.z.HALF.HI == 0) {
super->action = 9;
super->timer = 0;
super->subtimer = 0xF0;
this->timer = 0x1a4;
super->subtimer = 240;
this->timer = 420;
super->direction = 0;
super->speed = 0x60;
gPlayerState.flags &= ~PL_FLAGS20000;

6
src/object/keyStealingTakkuri.c
View File

@ -276,7 +276,8 @@ void KeyStealingTakkuri_Type3_Init(KeyStealingTakkuriEntity* this) {
super->action++;
super->collisionLayer = 2;
super->timer = 10; super->subtimer = 0;
super->timer = 10;
super->subtimer = 0;
super->spriteRendering.b3 = 1;
super->speed = 0;
super->direction = gUnk_0812412D[super->type2];
@ -329,7 +330,8 @@ void KeyStealingTakkuri_Type3_Action1(KeyStealingTakkuriEntity* this) {
}
break;
default:
super->timer = 10; break;
super->timer = 10;
break;
}
UpdateAnimationSingleFrame(super);
}

2
src/object/lavaPlatform.c
View File

@ -140,7 +140,7 @@ void LavaPlatform_Type1Action2(LavaPlatformEntity* this) {
if (LavaPlatform_IsPlayerOnPlatform(this)) {
super->action = 3;
super->flags &= ~ENT_COLLIDE;
super->timer = 0x14;
super->timer = 20;
gPlayerState.field_0x3f = 0xfd;
}
}

2
src/object/lilypadSmall.c
View File

@ -10,7 +10,7 @@ void LilypadSmall(Entity* this) {
if (this->action == 0) {
this->action = 1;
this->timer = 0x5a;
this->timer = 90;
rand = Random();
this->subtimer = rand;
this->frameIndex = (rand >> 0x10) & 3;

4
src/object/lockedDoor.c
View File

@ -214,7 +214,7 @@ void sub_080835F8(Entity* this) {
if (this->interactType == 0 && !CheckFlags(this->field_0x86.HWORD))
return;
this->action = 1;
this->timer = 0x14;
this->timer = 20;
sub_08083658(this);
SetFlag(this->field_0x86.HWORD);
sub_080526F8(-1);
@ -230,7 +230,7 @@ void sub_08083638(Entity* this) {
void sub_08083658(Entity* this) {
const struct_0811F680* tmp;
this->action = 1;
this->timer = 0x14;
this->timer = 20;
this->direction = this->field_0x7c.BYTES.byte2 << 3;
tmp = &gUnk_0811F680[this->field_0x7c.BYTES.byte2];
this->x.HALF.HI += tmp->x;

2
src/object/macroBook.c
View File

@ -35,7 +35,7 @@ void MacroBook(Entity* this) {
void MacroBook_Init(MacroBookEntity* this) {
super->action = 1;
super->timer = 0x80;
super->timer = 128;
super->subtimer = 0;
super->spriteRendering.b0 = 3;
this->unk80 = 0x80;

4
src/object/metalDoor.c
View File

@ -43,7 +43,7 @@ void sub_080A0684(Entity* this) {
void sub_080A0718(Entity* this) {
if (sub_08083734(this, 2) != 0) {
this->action = 2;
this->timer = 0xc;
this->timer = 12;
this->spriteSettings.draw = TRUE;
this->direction = 0;
this->y.HALF.HI += 0x24;
@ -79,7 +79,7 @@ void sub_080A074C(Entity* this) {
void sub_080A07BC(Entity* this) {
if (CheckFlags(this->field_0x86.HWORD)) {
this->action = 4;
this->timer = 0xc;
this->timer = 12;
this->direction = 0x10;
this->y.HALF.HI += 2;
sub_080A0870(this);

4
src/object/object12.c
View File

@ -41,7 +41,7 @@ void Object12_Init(Object12Entity* this) {
sub_080850FC(this);
} else {
super->action = 2;
super->timer = 0xf0;
super->timer = 240;
super->speed = 0x80;
super->direction = 0x18;
}
@ -75,7 +75,7 @@ void Object12_Action2(Object12Entity* this) {
void Object12_Action3(Object12Entity* this) {
if (--super->timer == 0) {
super->action = 4;
super->timer = 0x60;
super->timer = 96;
}
}

4
src/object/object2A.c
View File

@ -22,10 +22,10 @@ void Object2A_Init(Entity* this) {
switch (this->type) {
case 1:
this->y.HALF.HI -= 8;
this->timer = 0x28;
this->timer = 40;
break;
case 2:
this->timer = 0xf;
this->timer = 15;
sub_08004168(this);
break;
case 3:

6
src/object/object35.c
View File

@ -60,7 +60,7 @@ void Object35_Type0Init(Object35Entity* this) {
super->collisionLayer = 2;
UpdateSpriteForCollisionLayer(super);
super->spritePriority.b0 = 1;
super->timer = -0x4c;
super->timer = -76;
InitializeAnimation(super, super->type2);
}
@ -68,10 +68,10 @@ void Object35_Type0Action1(Object35Entity* this) {
s8 tmp;
GetNextFrame(super);
if (--super->timer == 0) {
super->timer = -0x4c;
super->timer = -76;
super->type2++;
tmp = 3;
super->type2 = super->type2 % tmp;
super->type2 %= tmp;
InitializeAnimation(super, super->type2);
}
}

2
src/object/object36.c
View File

@ -87,7 +87,7 @@ void sub_0808BC3C(Object36Entity* this) {
if (super->timer == 0) {
SetGlobalFlag(LV1TARU_OPEN);
super->action = 2;
super->subtimer = 0x80;
super->subtimer = 128;
super->spriteOffsetY = 0;
} else {
if ((super->timer & 1) != 0) {

4
src/object/object3E.c
View File

@ -41,7 +41,7 @@ void Object3E_Type0(Object3EEntity* this) {
switch (super->action) {
case 0:
super->action = 1;
super->timer = 0x40 - (Random() & 0x1f);
super->timer = 64 - (Random() & 0x1F);
super->frameIndex = 0;
super->animationState = 0;
super->spriteRendering.b3 = 3;
@ -61,7 +61,7 @@ void Object3E_Type0(Object3EEntity* this) {
if (--super->subtimer == 0) {
super->frameIndex = 0;
super->action = 1;
super->timer = 0x40 - (Random() & 0x1f);
super->timer = 64 - (Random() & 0x1F);
} else {
super->timer = 8;
tmp2 = super->animationState;

8
src/object/object43.c
View File

@ -48,13 +48,13 @@ void Object43_Init(Object43Entity* this) {
super->updatePriority = 6;
InitializeAnimation(super, 7);
if (super->type2 != 0) {
super->timer = 0x28;
super->timer = 40;
} else {
super->spriteSettings.draw = 1;
if ((gPlayerState.skills & SKILL_FAST_SPIN) != 0) {
super->timer = 0x28;
if (gPlayerState.skills & SKILL_FAST_SPIN) {
super->timer = 40;
} else {
super->timer = 0x50;
super->timer = 80;
}
Object43_Action1(this);

2
src/object/object8E.c
View File

@ -292,7 +292,7 @@ void Object8E_Type4(Object8EEntity* this) {
case 0:
super->action = 1;
super->timer = 60;
super->subtimer = 0x80;
super->subtimer = 128;
gRoomControls.camera_target = super;
gRoomControls.unk5 = 1;
if (super->x.HALF.HI > gPlayerEntity.x.HALF.HI) {

4
src/object/objectA8.c
View File

@ -93,7 +93,7 @@ void ObjectA8_Action1(ObjectA8Entity* this) {
if (super->timer != 0) {
super->timer *= 0x1e;
} else {
super->timer = 0xf0;
super->timer = 240;
}
super->action = 3;
super->subtimer = 1;
@ -184,7 +184,7 @@ void ObjectA8_Action4(ObjectA8Entity* this) {
void ObjectA8_Action5(ObjectA8Entity* this) {
super->action = 6;
super->timer = 0x80;
super->timer = 128;
super->subtimer = 6;
super->flags &= ~ENT_COLLIDE;
super->spriteSettings.draw = 1;

4
src/object/objectB4.c
View File

@ -112,7 +112,7 @@ void ObjectB4_Type2(Entity* this) {
this->spritePriority.b0 = 0;
this->spriteOrientation.flipY = 1;
this->frameIndex = 11;
this->timer = (Random() & 0x3f) + 0x40;
this->timer = (Random() & 0x3f) + 64;
this->subtimer = 0;
}
@ -120,7 +120,7 @@ void ObjectB4_Type2(Entity* this) {
this->timer = 4;
this->frameIndex = gUnk_08124B30[this->subtimer++] + 2;
if (gUnk_08124B30[this->subtimer] == 0xff) {
this->timer = (Random() & 0x3f) + 0x40;
this->timer = (Random() & 0x3f) + 64;
this->subtimer = 0;
}
}

2
src/object/objectE.c
View File

@ -13,7 +13,7 @@
void ObjectE(Entity* this) {
if (this->action == 0) {
this->action = 1;
this->timer = 0x14;
this->timer = 20;
sub_08004168(this);
} else {
if (this->timer-- == 0) {

2
src/object/octorokBossObject.c
View File

@ -177,7 +177,7 @@ NONMATCH("asm/non_matching/octorokBossObject/OctorokBossObject_Action1.inc",
}
if ((u32)this->timer == GET_HELPER(this)->tailCount - 1) {
this->action = 2;
this->timer = 0xf0;
this->timer = 240;
this->direction = gUnk_0812384C[(this->type2 & 0xf) * 2] + ((u8)Random() & 0xf);
this->speed = gUnk_0812384C[(this->type2 & 0xf) * 2 + 1] + ((u16)Random() & 0x1ff);
if (this->type != 0) {

2
src/object/picoBloom.c
View File

@ -26,7 +26,7 @@ void PicoBloom_Init(Entity* this) {
nextAction = 2;
}
this->action = nextAction;
this->timer = (Random() & 0x7f) + 0x7f;
this->timer = (Random() & 0x7f) + 127;
this->collisionLayer = 1;
UpdateSpriteForCollisionLayer(this);
InitializeAnimation(this, typeAnimationStates[this->type] + this->type2);

6
src/object/pushableFurniture.c
View File

@ -79,7 +79,7 @@ void PushableFurniture_Action1(PushableFurnitureEntity* this) {
case 0:
if (sub_0808FECC(this)) {
super->subAction = 1;
super->timer = 0xc;
super->timer = 12;
}
break;
case 1:
@ -189,10 +189,10 @@ bool32 sub_0808FC5C(PushableFurnitureEntity* this) {
if (this->unk_80 == 0) {
super->timer = 4;
} else {
super->timer = 0x18;
super->timer = 24;
}
if ((gPlayerState.flags & PL_MINISH) == 0) {
super->timer += 0x10;
super->timer += 16;
}
sub_0808FF50(this);
return TRUE;

6
src/object/pushableGrave.c
View File

@ -101,8 +101,8 @@ void PushableGrave_Action2(PushableGraveEntity* this) {
} else {
if (--super->subtimer == 0) {
super->action = 3;
super->timer = 0x60;
super->subtimer = 0x14;
super->timer = 96;
super->subtimer = 20;
RequestPriorityDuration(super, 0x60);
SoundReq(SFX_10F);
}
@ -177,7 +177,7 @@ bool32 sub_0809785C(PushableGraveEntity* this) {
if (CheckFlags(this->pushedFlag) != 0) {
super->action = 2;
super->subAction = 0;
super->timer = 0xf0;
super->timer = 240;
super->subtimer = 60;
super->direction = 0;
super->speed = 0x40;

4
src/object/smoke.c
View File

@ -21,10 +21,10 @@ void sub_0808A40C(Entity* this) {
if (this->action == 0) {
this->action = 1;
this->timer = 0x28;
this->timer = 40;
}
if (--this->timer == 0) {
this->timer = 0x40 - (Random() & 0x1f);
this->timer = 64 - (Random() & 0x1F);
ent = CreateObject(SMOKE, 1, 0);
if (ent != NULL) {
CopyPosition(this, ent);

2
src/object/treeHidingPortal.c
View File

@ -50,7 +50,7 @@ void sub_0809E86C(Entity* this) {
}
if (sub_0809E9A0() == 0x54) {
this->action = 2;
this->timer = 0xf;
this->timer = 15;
SetPlayerControl(1);
}
}

4
src/object/warpPoint.c
View File

@ -51,7 +51,7 @@ void sub_0808B474(Entity* this) {
if (!sub_0808B7C8(this))
return;
this->action = 4;
this->subtimer = 0x60;
this->subtimer = 96;
gPlayerEntity.x.HALF.HI = this->x.HALF.HI;
gPlayerEntity.y.HALF.HI = this->y.HALF.HI;
gPlayerEntity.animationState = 4;
@ -85,7 +85,7 @@ void sub_0808B590(Entity* this) {
if (this->timer)
return;
this->action = 5;
this->subtimer = 0x60;
this->subtimer = 96;
PutAwayItems();
gPlayerEntity.x.HALF.HI = this->x.HALF.HI;
gPlayerEntity.y.HALF.HI = this->y.HALF.HI;

6
src/playerItem/playerItemBomb.c
View File

@ -48,7 +48,7 @@ void PlayerItemBomb(PlayerItemBombEntity* this) {
super->timer -= 1;
}
if (super->timer == 0) {
super->subtimer = 0x50;
super->subtimer = 80;
this->unk_68 = 0;
super->spriteRendering.b0 = 3;
SetAffineInfo(super, 0x100, 0x100, 0);
@ -61,7 +61,7 @@ void PlayerItemBomb(PlayerItemBombEntity* this) {
}
super->action = 0x03;
super->spritePriority.b1 = 2;
super->timer = 0x0f;
super->timer = 15;
super->spriteSettings.draw = 0;
sub_0805EC60(super);
FreeCarryEntity(super);
@ -83,7 +83,7 @@ void sub_0801B250(PlayerItemBombEntity* this) {
if (super->type == 0xff) {
super->timer = 60;
} else if (super->type == 0xfe) {
super->timer = 0x0f;
super->timer = 15;
super->type = 0xff;
} else {
super->timer = 150;

8
src/playerItem/playerItemBottle.c
View File

@ -45,8 +45,8 @@ void PlayerItemBottle_Init(Entity* this) {
this->hurtType = 0x1f;
this->type = 1;
this->type2 = ITEM_BOTTLE_EMPTY;
this->timer = 0x52;
this->subtimer = 0x1b;
this->timer = 82;
this->subtimer = 27;
sub_0801766C(this);
SoundReq(SFX_1DC);
break;
@ -61,14 +61,14 @@ void PlayerItemBottle_Init(Entity* this) {
case ITEM_BOTTLE_PICOLYTE_GREEN:
case ITEM_BOTTLE_PICOLYTE_BLUE:
case ITEM_BOTTLE_PICOLYTE_WHITE:
this->timer = 0xd5;
this->timer = 213;
this->subtimer = 60;
break;
case BOTTLE_CHARM_NAYRU:
case BOTTLE_CHARM_FARORE:
case BOTTLE_CHARM_DIN:
default:
this->timer = 0x37;
this->timer = 55;
this->subtimer = 0;
}
this->action = 1;

2
src/playerItem/playerItemGustBig.c
View File

@ -65,7 +65,7 @@ void sub_08018CBC(Entity* this) {
if (pEVar3 != NULL) {
this->action = 1;
COLLISION_OFF(this);
this->timer = 0x56;
this->timer = 86;
this->hurtType = 0x1c;
this->damage = 6;
this->hitbox = (Hitbox*)&gUnk_080B3E18;

2
src/playerItem/playerItemGustJar.c
View File

@ -28,7 +28,7 @@ void PlayerItemGustJar(Entity* this) {
void PlayerItemGustJar_Init(Entity* this) {
this->action = 1;
this->subtimer = 0xf;
this->subtimer = 15;
this->hitbox = &gUnk_08132B28;
this->hitbox->unk2[2] = 3;
this->hitbox->unk2[1] = 3;

4
src/playerItem/playerItemLantern.c
View File

@ -18,8 +18,8 @@ void PlayerItemLantern(Entity* this) {
void sub_08054A60(Entity* this) {
this->flags |= (ENT_PERSIST | ENT_COLLIDE);
this->action = 0x01;
this->timer = 0x04;
this->action = 1;
this->timer = 4;
this->frameIndex = -1;
// TODO regalloc and mov 6 too early
this->updatePriority = 6;

2
src/playerItem/playerItemSwordBeam.c
View File

@ -70,7 +70,7 @@ void sub_08019580(Entity* this) {
if (--*(int*)&this->field_0x6c != -1) {
GetNextFrame(this);
LinearMoveUpdate(this);
this->timer += 0x01;
this->timer += 1;
if (this->type2 == 0) {
sub_0800451C(this);
}

2
src/playerUtils.c
View File

@ -771,7 +771,7 @@ bool32 sub_08078108(ChargeState* state) {
}
bool32 sub_08078124(ChargeState* state) {
state->chargeTimer -= 0x10;
state->chargeTimer -= 16;
if (state->chargeTimer < 0) {
state->chargeTimer = 0;
state->action = 2;

2
src/projectile/arrowProjectile.c
View File

@ -44,7 +44,7 @@ void ArrowProjectile_Init(Entity* this) {
this->action = 1;
this->spriteSettings.draw = 1;
COLLISION_OFF(this);
this->timer = 0x6a;
this->timer = 106;
this->subtimer = 0;
this->zVelocity = Q_16_16(10.0 / 256.0);
sub_080A94C0(this, this->type);

2
src/projectile/gleerokProjectile.c
View File

@ -99,7 +99,7 @@ void GleerokProjectile_Action1(Entity* this) {
this->action = 2;
sub_080A90D8(this);
if (this->type == 2) {
this->timer = 0xf;
this->timer = 15;
InitializeAnimation(this, 0x54);
} else {
InitializeAnimation(this, 0x52);

2
src/projectile/guardLineOfSight.c
View File

@ -46,7 +46,7 @@ void GuardLineOfSight(Entity* this) {
} else {
if (this->action == 0) {
this->action = 1;
this->timer = 0x12;
this->timer = 18;
this->spriteSettings.draw = 0;
this->speed = 0x800;
this->hitbox = (Hitbox*)&gUnk_080FD1E4;

2
src/projectile/gyorgTail.c
View File

@ -356,6 +356,6 @@ void sub_080AC884(Entity* this) {
this->parent->field_0x70.HALF_U.HI = 0;
this->action = 2;
this->timer = 60;
this->subtimer = 0x56;
this->subtimer = 86;
}
}

2
src/projectile/v1FireProjectile.c
View File

@ -73,7 +73,7 @@ void V1FireProjectile_Action1(Entity* this) {
LinearMoveUpdate(this);
if (GravityUpdate(this, 0) == 0) {
this->action = 2;
this->timer = 0xf;
this->timer = 15;
InitializeAnimation(this, 0x54);
sub_080AB4A4(this);
} else {

4
src/projectile/v2Projectile.c
View File

@ -88,7 +88,7 @@ void sub_080ABC90(Entity* this) {
void sub_080ABCC4(Entity* this) {
this->action = 1;
this->timer = (Random() & 0x3f) + 0x30;
this->timer = (Random() & 0x3f) + 48;
this->subtimer = 0;
this->direction = Random() & 0x1f;
this->field_0x74.HWORD = TILE(this->x.HALF.HI, this->y.HALF.HI);
@ -159,7 +159,7 @@ void sub_080ABE88(Entity* this) {
void sub_080ABEA8(Entity* this) {
this->action = 1;
this->timer = 0x60;
this->timer = 96;
this->spritePriority.b0 = 2;
this->gustJarFlags = 1;
if (this->type2 == 0) {

2
src/projectile/v3ElectricProjectile.c
View File

@ -31,7 +31,7 @@ void sub_080ABFEC(Entity* this) {
case 0: {
this->action = 1;
this->timer = 0;
this->subtimer = 0x7;
this->subtimer = 7;
this->cutsceneBeh.HALF.HI = 0x18;
this->damage = 0x88;
CopyPositionAndSpriteOffset(this->parent, this);

2
src/subtask.c
View File

@ -531,7 +531,7 @@ void sub_08055634(void) {
obj->y.HALF.HI = gRoomControls.origin_y + *(s16*)(ptr + 10);
}
gMenu.overlayType++;
gMenu.transitionTimer = 0x186;
gMenu.transitionTimer = 390;
}
void sub_08055674(void) {