diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-01-22 11:35:36 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-22 11:35:36 -0800 |
| commit | 85aaada18f7eace3284937c4da8db05f047d316b (patch) | |
| tree | b9aa9840d57e5d3bd889e29a86163d3387b5aec5 /src/projectile | |
| parent | 93e745e9638bb4f48e27908eebe2bb4eb349812e (diff) | |
| parent | 737302d9d1808e5a1def42725e27cef99d0196b2 (diff) | |
Merge pull request #310 from notyourav/pressurePlate
pressure plate ok
Diffstat (limited to 'src/projectile')
| -rw-r--r-- | src/projectile/cannonballProjectile.c | 4 | ||||
| -rw-r--r-- | src/projectile/dekuSeedProjectile.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/projectile/cannonballProjectile.c b/src/projectile/cannonballProjectile.c index 449240e1..5e07dfc4 100644 --- a/src/projectile/cannonballProjectile.c +++ b/src/projectile/cannonballProjectile.c @@ -5,7 +5,7 @@ extern void CreateItemOnGround(Entity*); extern s32 sub_080AF090(Entity*); extern void sub_080043A8(Entity*); extern void CreateChestSpawner(Entity*); -extern u32 sub_080177A0(Entity*, Entity*); +extern u32 IsColliding(Entity*, Entity*); extern void (*const CannonballProjectile_Functions[])(Entity*); extern void (*const CannonballProjectile_Actions[])(Entity*); @@ -79,7 +79,7 @@ bool32 sub_080AB634(Entity* this) { Entity** entities = ((Entity**)&this->parent->zVelocity); u32 i; for (i = 0; i <= 3; ++i) { - if (entities[i] != NULL && (sub_080177A0(this, entities[i]) != 0)) { + if (entities[i] != NULL && (IsColliding(this, entities[i]) != 0)) { if (entities[i]->action < 3) { entities[i]->action = 3; entities[i]->actionDelay = 0x1e; diff --git a/src/projectile/dekuSeedProjectile.c b/src/projectile/dekuSeedProjectile.c index d84d0409..3afad118 100644 --- a/src/projectile/dekuSeedProjectile.c +++ b/src/projectile/dekuSeedProjectile.c @@ -5,7 +5,7 @@ extern s32 sub_080AF090(Entity*); extern s32 IsProjectileOffScreen(Entity*); extern void sub_08016AD2(Entity*); -extern u32 sub_080177A0(Entity*, Entity*); +extern u32 IsColliding(Entity*, Entity*); extern void (*const DekuSeedProjectile_Functions[])(Entity*); extern void (*const DekuSeedProjectile_Actions[])(Entity*); @@ -70,7 +70,7 @@ void DekuSeedProjectile_Action1(Entity* this) { } if (this->field_0xf != 0) { parent = this->parent; - if ((parent->next != NULL) && (sub_080177A0(this, parent) != 0)) { + if ((parent->next != NULL) && (IsColliding(this, parent) != 0)) { this->iframes = 0x10; this->knockbackDirection = -this->direction; this->bitfield = 0x80; |