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/crow.c | |
| parent | 75c57e31240c706e1ca9364954970861c1a85e78 (diff) | |
Rename enemy functions
Diffstat (limited to 'src/enemy/crow.c')
| -rw-r--r-- | src/enemy/crow.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/enemy/crow.c b/src/enemy/crow.c index 4dfdc773..efe2b3e5 100644 --- a/src/enemy/crow.c +++ b/src/enemy/crow.c @@ -15,7 +15,7 @@ typedef struct { u8 unk_84; } CrowEntity; -void (*const gUnk_080CE978[])(Entity*); +void (*const Crow_Functions[])(Entity*); void (*const gUnk_080CE990[])(CrowEntity*); void (*const gUnk_080CE9A4[])(CrowEntity*); extern Entity* gUnk_020000B0; @@ -26,10 +26,10 @@ void sub_08032B38(CrowEntity* this); void sub_08032B10(CrowEntity* this); void Crow(Entity* this) { - gUnk_080CE978[GetNextFunction(this)](this); + Crow_Functions[GetNextFunction(this)](this); } -void sub_08032810(CrowEntity* this) { +void Crow_OnTick(CrowEntity* this) { gUnk_080CE990[super->action](this); if (super->field_0xf) { if (--super->field_0xf == 0) { @@ -38,7 +38,7 @@ void sub_08032810(CrowEntity* this) { } } -void sub_08032844(CrowEntity* this) { +void Crow_OnCollision(CrowEntity* this) { if (super->bitfield & 0x80) { if ((super->bitfield & 0x3f) == 0) { COLLISION_OFF(super); @@ -64,7 +64,7 @@ void sub_08032844(CrowEntity* this) { GetNextFrame(super); } -void sub_080328B8(CrowEntity* this) { +void Crow_OnGrabbed(CrowEntity* this) { gUnk_080CE9A4[super->subAction](this); GetNextFrame(super); @@ -90,7 +90,7 @@ void sub_0803290C(CrowEntity* this) { void sub_08032914(CrowEntity* this) { if (sub_0806F3E4(super)) { - sub_0804A7D4(super); + GenericDeath(super); } } @@ -266,9 +266,9 @@ void sub_08032B38(CrowEntity* this) { GetNextFrame(super); } -void (*const gUnk_080CE978[])(Entity*) = { - (EntityActionPtr)sub_08032810, (EntityActionPtr)sub_08032844, sub_08001324, sub_0804A7D4, sub_08001242, - (EntityActionPtr)sub_080328B8, +void (*const Crow_Functions[])(Entity*) = { + (EntityActionPtr)Crow_OnTick, (EntityActionPtr)Crow_OnCollision, GenericKnockback, GenericDeath, GenericConfused, + (EntityActionPtr)Crow_OnGrabbed, }; void (*const gUnk_080CE990[])(CrowEntity*) = { |
