diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2022-02-06 20:01:41 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2022-02-12 20:03:27 +0100 |
| commit | d6c79aa26346afc85bcfa724d3c086fb06c888dc (patch) | |
| tree | 72b882ddb8ba879c7ab3a405641965bdf4fdf79b /src/enemy/leever.c | |
| parent | 75c57e31240c706e1ca9364954970861c1a85e78 (diff) | |
Rename enemy functions
Diffstat (limited to 'src/enemy/leever.c')
| -rw-r--r-- | src/enemy/leever.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/enemy/leever.c b/src/enemy/leever.c index df9542f0..405cf0dc 100644 --- a/src/enemy/leever.c +++ b/src/enemy/leever.c @@ -16,7 +16,7 @@ extern Entity* gUnk_020000B0; bool32 Leever_PlayerInRange(Entity*, s32); void Leever_Move(Entity*); -extern void (*const gLeeverFunctions[])(Entity*); +extern void (*const Leever_Functions[])(Entity*); extern void (*const gLeeverActions[])(Entity*); extern const s8 gLeeverDrift[]; extern const u16 gUnk_080CA4CA[]; @@ -33,7 +33,7 @@ enum { }; void Leever(Entity* this) { - EnemyFunctionHandler(this, gLeeverFunctions); + EnemyFunctionHandler(this, Leever_Functions); SetChildOffset(this, 0, 1, -0x10); } @@ -41,22 +41,22 @@ void Leever_OnTick(Entity* this) { gLeeverActions[this->action](this); } -void sub_0801FC40(Entity* this) { +void Leever_OnCollision(Entity* this) { if (this->bitfield == 0x80) { if (this->action == 3) { this->field_0x74.HWORD = 1; } } else { - if (this->field_0x43 != 0) { - sub_0804A9FC(this, 0x1c); + if (this->confusedTime != 0) { + Create0x68FX(this, FX_STARS); } } - sub_0804AA30(this, gLeeverFunctions); + EnemyFunctionHandlerAfterCollision(this, Leever_Functions); } -void sub_0801FC7C(Entity* this) { +void Leever_OnDeath(Entity* this) { if (this->type == LeeverForm_Red) { - sub_0804A7D4(this); + GenericDeath(this); } else { CreateDeathFx(this, 0xf1, 0); } @@ -184,12 +184,12 @@ void Leever_Move(Entity* this) { } // clang-format off -void (*const gLeeverFunctions[])(Entity*) = { +void (*const Leever_Functions[])(Entity*) = { Leever_OnTick, - sub_0801FC40, - sub_08001324, - sub_0801FC7C, - sub_08001242, + Leever_OnCollision, + GenericKnockback, + Leever_OnDeath, + GenericConfused, Leever_OnTick, }; |
