diff options
| author | theo3 <arisstephenson2@gmail.com> | 2023-12-30 20:05:32 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2023-12-30 20:05:32 -0800 |
| commit | 201955ea052a5188f2e59bdcdbf6c52ff158ee66 (patch) | |
| tree | 66474a7515b56c90e1d0b94a0a39f42da6677d71 /src/enemy/puffstool.c | |
| parent | 37714644960c56650dd1067b86aafa685eaf01f4 (diff) | |
create enemy struct and enemy flags
Diffstat (limited to 'src/enemy/puffstool.c')
| -rw-r--r-- | src/enemy/puffstool.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c index dca8086a..7018c562 100644 --- a/src/enemy/puffstool.c +++ b/src/enemy/puffstool.c @@ -56,7 +56,7 @@ extern const s8 gUnk_080CC0C2[]; void Puffstool(PuffstoolEntity* this) { EnemyFunctionHandler(super, (EntityActionArray)Puffstool_Functions); - SetChildOffset(super, 0, 1, -0x10); + EnemySetFXOffset(super, 0, 1, -0x10); } void Puffstool_OnTick(PuffstoolEntity* this) { @@ -71,7 +71,7 @@ void Puffstool_OnCollide(PuffstoolEntity* this) { /* ... */ break; case 0x1b: - sub_0804AA1C(super); + EnemyDetachFX(super); tmp = gUnk_080CBFE8[(*(Entity**)&super->contactedEntity)->type]; if (tmp < this->unk_82) { @@ -132,7 +132,7 @@ void sub_08025180(PuffstoolEntity* this) { super->timer = Random(); super->animationState = (((*(Entity**)&super->contactedEntity)->direction ^ 0x10) >> 3); InitializeAnimation(super, super->animationState + 4); - sub_0804AA1C(super); + EnemyDetachFX(super); } void sub_080251AC(PuffstoolEntity* this) { @@ -291,7 +291,7 @@ void sub_080254B4(PuffstoolEntity* this) { sub_080256B4(this); } else { super->action = 0xc; - Create0x68FX(super, FX_STARS); + EnemyCreateFX(super, FX_STARS); } InitializeAnimation(super, 0); } @@ -375,7 +375,7 @@ void sub_0802563C(PuffstoolEntity* this) { super->hitType = 0x82; this->unk_82 = 240; sub_080256B4(this); - sub_0804AA1C(super); + EnemyDetachFX(super); } else if (this->unk_84 < 120) { u32 tmp3 = gUnk_080CBFF8[this->unk_84 >> 4]; if ((this->unk_84 & tmp3) == 0) { |