This commit is contained in:
Elliptic Ellipsis 2022-06-28 03:28:39 +01:00
parent 890a554427
commit 598896cefd
12 changed files with 12 additions and 17 deletions

View File

@ -578,7 +578,6 @@ void LoadBgAnimations(u16* param_1) {
while (param_1[0] != 0xffff) {
animation->currentFrame = gUnk_080B7278[param_1[0]];
animation->timer = GetBgAnimationTimer(&animation->currentFrame->unk_4);
;
animation++;
param_1++;
}

View File

@ -77,8 +77,7 @@ void GyorgChild_OnGrabbed_Action3(GyorgChildEntity* this) {
void GyorgChild_Action0(GyorgChildEntity* this) {
static const s8 gUnk_080D1EA0[] = {
80, 1, 64, 1, 48, 0x1, 32, 1, 16, 1, 0,
0, 16, -1, 32, -1, 48, -1, 64, -1, 80, -1,
80, 1, 64, 1, 48, 1, 32, 1, 16, 1, 0, 0, 16, -1, 32, -1, 48, -1, 64, -1, 80, -1,
};
super->gustJarFlags = 1;
super->spriteOrientation.flipY = 3;

View File

@ -153,8 +153,7 @@ void sub_080325C4(Entity* this) {
}
u32 sub_080325E8(Entity* this) {
if ((sub_08049FA0(this) && sub_08049FDC(this, 1)) &&
(EntityInRectRadius(this, gUnk_020000B0, 0x68, 0x40) != 0)) {
if ((sub_08049FA0(this) && sub_08049FDC(this, 1)) && (EntityInRectRadius(this, gUnk_020000B0, 0x68, 0x40) != 0)) {
if (((GetFacingDirection(this, gUnk_020000B0) - (DirectionRound(this->frame)) + 2) & 0x1F) < 5) {
this->action = 3;
this->timer = 12;

View File

@ -380,7 +380,7 @@ void OctorokBoss_Intro_SubAction3(OctorokBossEntity* this) {
void OctorokBoss_Intro_SubAction4(OctorokBossEntity* this) {
if (this->timer-- == 0) {
super->subAction = 5;
this->timer = 45;;
this->timer = 45;
// Make the player look towards the exit
gPlayerEntity.animationState = 0;
} else {
@ -715,7 +715,7 @@ void OctorokBoss_Action1_Attack_Type2_1(OctorokBossEntity* this) {
this->heap->targetAngle = this->angle.HALF.HI;
} else {
super->type2 = 2;
this->timer = 45;;
this->timer = 45;
}
SoundReq(SFX_155);
}
@ -813,7 +813,7 @@ void OctorokBoss_ExecuteAttackVacuum(OctorokBossEntity* this) {
if (this->unk_80 == 1) {
this->unk_80 = 2;
super->type2 = 2;
this->timer = 45;;
this->timer = 45;
this->angularSpeed.HWORD = 0x100;
this->heap->field_0x2 = 0;
return;

View File

@ -246,7 +246,7 @@ void MiscManager_Type5(MiscManager* this) {
case 1:
if (CheckFlags(this->unk_3e)) {
RequestPriorityDuration((Entity*)this, 75);
super->timer = 45;;
super->timer = 45;
super->action++;
}
}

View File

@ -78,7 +78,7 @@ void sub_080588F8(RollingBarrelManager* this) {
case 0xa0:
case 0xf0:
this->unk_28 = this->unk_24.HALF.HI;
super->subtimer = 45;;
super->subtimer = 45;
SoundReq(SFX_BARREL_ROLL_STOP);
}
}

View File

@ -83,7 +83,7 @@ void VaatiAppearingManager_Action1(VaatiAppearingManager* this) {
case 1:
if (--this->field_0x20 == 0x10) {
super->subAction = 2;
super->timer = 45;;
super->timer = 45;
}
break;
case 2:
@ -110,7 +110,7 @@ void VaatiAppearingManager_Action2(VaatiAppearingManager* this) {
switch (super->subAction) {
case 0:
super->subAction = 1;
super->timer = 45;;
super->timer = 45;
this->field_0x20 = 1;
gScreen.lcd.displayControl |= DISPCNT_BG3_ON;
break;

View File

@ -46,7 +46,7 @@ void sub_08098D6C(Entity* this) {
if (CheckFlags(this->field_0x86.HWORD)) {
this->action = 2;
this->timer = 45;;
this->timer = 45;
ent = CreateFx(this, FX_BIG_EXPLOSION2, 0);
if (ent != NULL) {
ent->y.HALF.HI += 8;

View File

@ -295,7 +295,6 @@ void Bird_Type9(Entity* this) {
this->spritePriority.b0 = 0;
this->spriteRendering.b3 = 0;
this->spriteOrientation.flipY = 1;
;
SetDefaultPriority(this, 6);
this->x.HALF.HI = gRoomControls.scroll_x;
this->y.HALF.HI = gPlayerEntity.y.HALF.HI;

View File

@ -93,7 +93,7 @@ void FourElements_Action2(FourElementsEntity* this) {
DeleteEntity(super->child);
super->spriteSettings.draw = 0;
super->action = 3;
super->timer = 45;;
super->timer = 45;
gScreen.controls.layerFXControl = 0x640;
gScreen.controls.alphaBlend = 0;
InitItemGetSequence(super->type, 0, 1);

View File

@ -51,7 +51,6 @@ void sub_0808C964(Entity* this) {
this->spriteSettings.draw = 1;
this->spriteOrientation.flipY = 2;
this->spriteRendering.b3 = 2;
;
this->spritePriority.b0 = this->type2;
if (this->id != OBJECT_75 && (u8)(this->type - 1) < 3) {
this->spriteRendering.b0 = 3;

View File

@ -24,7 +24,7 @@ void ThoughtBubble_Init(Entity* this) {
this->action = 1;
this->spriteSettings.draw = 1;
if (this->timer == 0) {
this->timer = 45;;
this->timer = 45;
}
this->spriteOrientation.flipY = 1;
InitializeAnimation(this, this->type2);