diff options
| author | Elliptic Ellipsis <elliptic.ellipsis@gmail.com> | 2022-03-25 02:36:10 +0000 |
|---|---|---|
| committer | Elliptic Ellipsis <elliptic.ellipsis@gmail.com> | 2022-03-25 02:36:10 +0000 |
| commit | b3a2644b4d45adec4144d4e93c87d85588bc191d (patch) | |
| tree | 110e2c759d0eb0ac8d7779bf98451798f3bd7707 /src | |
| parent | fa1eb0152882a308bf8fe0e1947c4379adedeb54 (diff) | |
Format
Diffstat (limited to 'src')
| -rw-r--r-- | src/enemy/flyingSkull.c | 2 | ||||
| -rw-r--r-- | src/enemy/octorokBoss.c | 3 | ||||
| -rw-r--r-- | src/movement.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/enemy/flyingSkull.c b/src/enemy/flyingSkull.c index cfab1b7c..85ebe162 100644 --- a/src/enemy/flyingSkull.c +++ b/src/enemy/flyingSkull.c @@ -223,7 +223,7 @@ void sub_0803A09C(FlyingSkullEntity* this) { GetNextFrame(super); ProcessMovement2(super); - if (super->collisions != COL_NONE) { + if (super->collisions != COL_NONE) { sub_0803A0E0(this); } } diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c index d45fc744..c5b944f7 100644 --- a/src/enemy/octorokBoss.c +++ b/src/enemy/octorokBoss.c @@ -644,7 +644,8 @@ void OctorokBoss_Action1_ChargeAttack(OctorokBossEntity* this) { if ((super->direction != 0) && (super->direction != 0x10)) { knockbackCondition = ((super->collisions & (COL_EAST_ANY | COL_WEST_ANY)) != COL_NONE); } - if (((super->direction != 0x18) && (super->direction != 8)) && (super->collisions & (COL_NORTH_ANY | COL_SOUTH_ANY))) { + if (((super->direction != 0x18) && (super->direction != 8)) && + (super->collisions & (COL_NORTH_ANY | COL_SOUTH_ANY))) { knockbackCondition = TRUE; } if (knockbackCondition) { diff --git a/src/movement.c b/src/movement.c index 78924405..1e54b3c5 100644 --- a/src/movement.c +++ b/src/movement.c @@ -1589,7 +1589,7 @@ bool32 IsTileCollision(const u8* layer, s32 x, s32 y, u32 collisionType) { FilledAll, FilledAll, /**/ - FilledNone + FilledNone, }; if (tileType > 0x6f) { return TRUE; |