diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-31 02:12:41 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-31 02:12:41 +0100 |
| commit | 109b1020dcbfa17e80d28c522b5d792f7b3c6d46 (patch) | |
| tree | cf23c1134de2891d0eed3b55549e70b29eb1997f /src/enemy/spinyBeetle.c | |
| parent | 957da774e4c34100e0bd352b1570af02bb7f7521 (diff) | |
| parent | 9c87bcca8ea4b52199ed908c0ea28ab08b1d0747 (diff) | |
Merge branch 'master' into tilemap-docs
Diffstat (limited to 'src/enemy/spinyBeetle.c')
| -rw-r--r-- | src/enemy/spinyBeetle.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/enemy/spinyBeetle.c b/src/enemy/spinyBeetle.c index 4d481b59..15d4f04e 100644 --- a/src/enemy/spinyBeetle.c +++ b/src/enemy/spinyBeetle.c @@ -1,6 +1,11 @@ -#define NENT_DEPRECATED -#include "entity.h" +/** + * @file spinyBeetle.c + * @ingroup Enemies + * + * @brief Spiny Beetle enemy + */ #include "enemy.h" +#include "entity.h" #include "functions.h" #include "object.h" #include "tiles.h" @@ -130,19 +135,19 @@ void sub_08033958(SpinyBeetleEntity* this) { case 0: if (this->unk_78 == 0) return; - if (super->y.HALF.HI - gPlayerEntity.y.HALF.HI > 0x30) + if (super->y.HALF.HI - gPlayerEntity.base.y.HALF.HI > 0x30) return; break; case 0x10: - if (gPlayerEntity.y.HALF.HI - super->y.HALF.HI > 0x30) + if (gPlayerEntity.base.y.HALF.HI - super->y.HALF.HI > 0x30) return; break; case 8: - if (gPlayerEntity.x.HALF.HI - super->x.HALF.HI > 0x30) + if (gPlayerEntity.base.x.HALF.HI - super->x.HALF.HI > 0x30) return; break; case 0x18: - if (super->x.HALF.HI - gPlayerEntity.x.HALF.HI > 0x30) + if (super->x.HALF.HI - gPlayerEntity.base.x.HALF.HI > 0x30) return; break; } |