mirror of
https://github.com/zeldaret/tmc
synced 2026-08-19 22:02:40 -04:00
Should be the rest of them
This commit is contained in:
@@ -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);
|
||||
|
||||
+2
-2
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
+1
-1
@@ -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);
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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:
|
||||
|
||||
+7
-6
@@ -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);
|
||||
|
||||
+3
-3
@@ -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);
|
||||
|
||||
+3
-3
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
+1
-1
@@ -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();
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user