diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2022-02-12 20:00:08 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2022-02-12 20:03:27 +0100 |
| commit | b69a6d223c72bc4b88fef1527225d06854219f34 (patch) | |
| tree | c6c018bb7e10d4e8a326f057283a91661ecaccf8 /src/enemy/sensorBladeTrap.c | |
| parent | d6c79aa26346afc85bcfa724d3c086fb06c888dc (diff) | |
Rename movement functions
Diffstat (limited to 'src/enemy/sensorBladeTrap.c')
| -rw-r--r-- | src/enemy/sensorBladeTrap.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/enemy/sensorBladeTrap.c b/src/enemy/sensorBladeTrap.c index d3e28c2f..7ca53a62 100644 --- a/src/enemy/sensorBladeTrap.c +++ b/src/enemy/sensorBladeTrap.c @@ -9,7 +9,6 @@ #include "functions.h" extern u32 sub_0804A024(Entity*, u32, u32); -extern bool32 sub_080AF038(Entity*); extern u8 gUnk_02027EB4[]; extern u8 gUnk_0200D654[]; @@ -61,7 +60,7 @@ void sub_0802BA18(Entity* this) { } void sub_0802BA8C(Entity* this) { - if (!sub_080AF038(this)) { + if (!ProcessMovement12(this)) { sub_0802BB10(this); } else { switch (this->direction >> 3) { @@ -86,7 +85,7 @@ void sub_0802BA8C(Entity* this) { } void sub_0802BAFC(Entity* this) { - if (!sub_080AF038(this)) { + if (!ProcessMovement12(this)) { this->action = 1; } } @@ -101,7 +100,7 @@ void sub_0802BB10(Entity* this) { bool32 sub_0802BB2C(Entity* this, u32 param_2) { u8* layer = this->collisionLayer == 2 ? gUnk_0200D654 : gUnk_02027EB4; const s8* ptr = &gUnk_080CD3DC[param_2 >> 2]; - return sub_080AE4CC(layer, this->x.HALF.HI + ptr[0], this->y.HALF.HI + ptr[1], 0); + return IsTileCollision(layer, this->x.HALF.HI + ptr[0], this->y.HALF.HI + ptr[1], 0); } // clang-format off |