diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-02-23 18:32:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-23 18:32:28 -0800 |
| commit | f73f1767fe5139debc56f5df3f44dea62a473b01 (patch) | |
| tree | 20ffbab4438d79a9605e9b36faf0d9a2212f80b6 /include | |
| parent | 71af9de0acbf98cf0621a4ea1fbe89c01ea58a76 (diff) | |
| parent | df21aa7eb5e935e899ed634fd9c9de58b4e62d5c (diff) | |
Merge pull request #403 from octorock/enemy4D
Diffstat (limited to 'include')
| -rw-r--r-- | include/enemy.h | 2 | ||||
| -rw-r--r-- | include/functions.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/enemy.h b/include/enemy.h index 4b9fc37b..91f41820 100644 --- a/include/enemy.h +++ b/include/enemy.h @@ -210,7 +210,7 @@ void TorchTrap(Entity*); void VaatiRebornEnemy(Entity*); void VaatiProjectile(Entity*); void BallChainSoldier(Entity*); -void Enemy4D(Entity*); +void Enemy4D(); void Ghini(); void VaatiTransfigured(Entity*); void Enemy50(); diff --git a/include/functions.h b/include/functions.h index ecc89b87..2273b938 100644 --- a/include/functions.h +++ b/include/functions.h @@ -25,7 +25,7 @@ extern void DrawDirect(u32, u32); // trampoline to sub_080B27F4 extern void DrawEntities(void); extern void DrawOAMCmd(void); extern void EnemyFunctionHandlerAfterCollision(Entity*, void (*const[])()); -extern u32 EntityWithinDistance(Entity*, s32, s32, s32); +extern bool32 EntityWithinDistance(Entity*, s32, s32, s32); extern void FlushSprites(void); extern void GenericKnockback2(Entity*); extern LayerStruct* GetLayerByIndex(u32); |