From 598896cefd7fb1b44d874cc90772a72d252f7b70 Mon Sep 17 00:00:00 2001 From: Elliptic Ellipsis Date: Tue, 28 Jun 2022 03:28:39 +0100 Subject: [PATCH] Format --- src/beanstalkSubtask.c | 1 - src/enemy/gyorgChild.c | 3 +-- src/enemy/keaton.c | 3 +-- src/enemy/octorokBoss.c | 6 +++--- src/manager/miscManager.c | 2 +- src/manager/rollingBarrelManager.c | 2 +- src/manager/vaatiAppearingManager.c | 4 ++-- src/object/bigVortex.c | 2 +- src/object/bird.c | 1 - src/object/fourElements.c | 2 +- src/object/macroMushroomStalks.c | 1 - src/object/thoughtBubble.c | 2 +- 12 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/beanstalkSubtask.c b/src/beanstalkSubtask.c index b4992d01..f9e54925 100644 --- a/src/beanstalkSubtask.c +++ b/src/beanstalkSubtask.c @@ -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++; } diff --git a/src/enemy/gyorgChild.c b/src/enemy/gyorgChild.c index 1d872981..54423715 100644 --- a/src/enemy/gyorgChild.c +++ b/src/enemy/gyorgChild.c @@ -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; diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c index 6a1dbdcb..d1cbd490 100644 --- a/src/enemy/keaton.c +++ b/src/enemy/keaton.c @@ -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; diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c index 62be3d1a..0ecc6cd4 100644 --- a/src/enemy/octorokBoss.c +++ b/src/enemy/octorokBoss.c @@ -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; diff --git a/src/manager/miscManager.c b/src/manager/miscManager.c index ed7f9277..5d52ad2d 100644 --- a/src/manager/miscManager.c +++ b/src/manager/miscManager.c @@ -246,7 +246,7 @@ void MiscManager_Type5(MiscManager* this) { case 1: if (CheckFlags(this->unk_3e)) { RequestPriorityDuration((Entity*)this, 75); - super->timer = 45;; + super->timer = 45; super->action++; } } diff --git a/src/manager/rollingBarrelManager.c b/src/manager/rollingBarrelManager.c index 56337dfe..9e2c161f 100644 --- a/src/manager/rollingBarrelManager.c +++ b/src/manager/rollingBarrelManager.c @@ -78,7 +78,7 @@ void sub_080588F8(RollingBarrelManager* this) { case 0xa0: case 0xf0: this->unk_28 = this->unk_24.HALF.HI; - super->subtimer = 45;; + super->subtimer = 45; SoundReq(SFX_BARREL_ROLL_STOP); } } diff --git a/src/manager/vaatiAppearingManager.c b/src/manager/vaatiAppearingManager.c index ac4cd948..6fc89add 100644 --- a/src/manager/vaatiAppearingManager.c +++ b/src/manager/vaatiAppearingManager.c @@ -83,7 +83,7 @@ void VaatiAppearingManager_Action1(VaatiAppearingManager* this) { case 1: if (--this->field_0x20 == 0x10) { super->subAction = 2; - super->timer = 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; diff --git a/src/object/bigVortex.c b/src/object/bigVortex.c index 971f7fa7..0347dd24 100644 --- a/src/object/bigVortex.c +++ b/src/object/bigVortex.c @@ -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; diff --git a/src/object/bird.c b/src/object/bird.c index ccf85c34..e7346656 100644 --- a/src/object/bird.c +++ b/src/object/bird.c @@ -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; diff --git a/src/object/fourElements.c b/src/object/fourElements.c index f65edf16..1754134f 100644 --- a/src/object/fourElements.c +++ b/src/object/fourElements.c @@ -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); diff --git a/src/object/macroMushroomStalks.c b/src/object/macroMushroomStalks.c index de334eb6..d5a575ec 100644 --- a/src/object/macroMushroomStalks.c +++ b/src/object/macroMushroomStalks.c @@ -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; diff --git a/src/object/thoughtBubble.c b/src/object/thoughtBubble.c index 9916dbc3..14e9a38a 100644 --- a/src/object/thoughtBubble.c +++ b/src/object/thoughtBubble.c @@ -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);