From 7ad3963170eec7708faf3cd9132590c2332c9848 Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Sun, 23 Jan 2022 23:42:39 +0200 Subject: [PATCH] clang format --- src/enemy/mazaalBracelet.c | 2 +- src/npc/npc5.c | 5 ++--- src/object/gyorgBossObject.c | 2 +- src/projectile/mandiblesProjectile.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c index 80287544..55d40deb 100644 --- a/src/enemy/mazaalBracelet.c +++ b/src/enemy/mazaalBracelet.c @@ -1165,7 +1165,7 @@ void sub_0803B5C0(Entity* this) { u32 sub_0803B610(Entity* this) { return EntityWithinDistance(this, gPlayerEntity.x.HALF.HI + gUnk_080CFD19[this->type], - gPlayerEntity.y.HALF.HI - 0xc, 8); + gPlayerEntity.y.HALF.HI - 0xc, 8); } // sub_0803B698 was the tail of this function diff --git a/src/npc/npc5.c b/src/npc/npc5.c index 4ddcc4c5..ad5b98f2 100644 --- a/src/npc/npc5.c +++ b/src/npc/npc5.c @@ -182,8 +182,7 @@ void sub_08060BA0(Entity* this) { this->speed = 0x1e0; sub_08061120(this, ((UnkHeap*)this->myHeap)->unk_7, ((UnkHeap*)this->myHeap)->unk_8, 0xc); sub_08061170(this); - if (EntityWithinDistance(this, ((UnkHeap*)this->myHeap)->unk_7, ((UnkHeap*)this->myHeap)->unk_8, 4) != - 0) { + if (EntityWithinDistance(this, ((UnkHeap*)this->myHeap)->unk_7, ((UnkHeap*)this->myHeap)->unk_8, 4) != 0) { ((UnkHeap*)this->myHeap)->unk_0 &= 0xf7; } } else { @@ -231,7 +230,7 @@ void sub_08060BA0(Entity* this) { sub_08061120(this, ((UnkHeap*)this->myHeap)->unk_3, ((UnkHeap*)this->myHeap)->unk_4, 0xc); sub_08061170(this); if (EntityWithinDistance(this, ((UnkHeap*)this->myHeap)->unk_3, ((UnkHeap*)this->myHeap)->unk_4, - 4) != 0) { + 4) != 0) { ((UnkHeap*)this->myHeap)->unk_0 &= 0xfd; } } else { diff --git a/src/object/gyorgBossObject.c b/src/object/gyorgBossObject.c index f348b6e6..3bef5d5f 100644 --- a/src/object/gyorgBossObject.c +++ b/src/object/gyorgBossObject.c @@ -419,7 +419,7 @@ void sub_080A1FF0(GyorgBossObjectEntity* this) { } if (this->unk_7b) { if (EntityWithinDistance(&gPlayerEntity, gRoomControls.origin_x + 0x200, gRoomControls.origin_y + 0x210, - 0x100)) { + 0x100)) { if (super->actionDelay == 0) { super->actionDelay = 0x78; } else { diff --git a/src/projectile/mandiblesProjectile.c b/src/projectile/mandiblesProjectile.c index 257d0f1f..d0526d09 100644 --- a/src/projectile/mandiblesProjectile.c +++ b/src/projectile/mandiblesProjectile.c @@ -304,7 +304,7 @@ NONMATCH("asm/non_matching/mandiblesProjectile/sub_080AA374.inc", bool32 sub_080 animationState = this->child->animationState; uVar1 = sub_0806F824(this, this->child, gUnk_08129D14[animationState], gUnk_08129D14[animationState + 1]); if (EntityWithinDistance(this, this->child->x.HALF.HI + gUnk_08129D14[animationState], - this->child->y.HALF.HI + gUnk_08129D14[animationState + 1], 8) != 0) { + this->child->y.HALF.HI + gUnk_08129D14[animationState + 1], 8) != 0) { result = TRUE; } else { sub_08004596(this, uVar1);