summaryrefslogtreecommitdiff
path: root/src/projectile
diff options
context:
space:
mode:
Diffstat (limited to 'src/projectile')
-rw-r--r--src/projectile/arrowProjectile.c2
-rw-r--r--src/projectile/boneProjectile.c2
-rw-r--r--src/projectile/darkNutSwordSlash.c2
-rw-r--r--src/projectile/dekuSeedProjectile.c4
-rw-r--r--src/projectile/dirtBallProjectile.c2
-rw-r--r--src/projectile/gleerokProjectile.c3
-rw-r--r--src/projectile/guardLineOfSight.c4
-rw-r--r--src/projectile/keatonDagger.c2
-rw-r--r--src/projectile/lakituLightning.c2
-rw-r--r--src/projectile/mandiblesProjectile.c2
-rw-r--r--src/projectile/moblinSpear.c2
-rw-r--r--src/projectile/octorokBossProjectile.c4
-rw-r--r--src/projectile/projectile5.c2
-rw-r--r--src/projectile/removableDust.c2
-rw-r--r--src/projectile/rockProjectile.c2
-rw-r--r--src/projectile/spiderWeb.c2
-rw-r--r--src/projectile/stalfosProjectile.c2
-rw-r--r--src/projectile/v1DarkMagicProjectile.c2
-rw-r--r--src/projectile/v1FireProjectile.c2
-rw-r--r--src/projectile/v2Projectile.c2
20 files changed, 23 insertions, 24 deletions
diff --git a/src/projectile/arrowProjectile.c b/src/projectile/arrowProjectile.c
index 7acc8003..c47f0414 100644
--- a/src/projectile/arrowProjectile.c
+++ b/src/projectile/arrowProjectile.c
@@ -34,7 +34,7 @@ void ArrowProjectile_OnTick(Entity* this) {
}
void ArrowProjectile_OnCollision(Entity* this) {
- if ((this->contactFlags & CONTACT_TAKE_DAMAGE) != 0) {
+ if ((this->contactFlags & CONTACT_NOW) != 0) {
if ((this->contactFlags & 0x3f) != 0) {
ModHealth(-2);
sub_080A9488(this);
diff --git a/src/projectile/boneProjectile.c b/src/projectile/boneProjectile.c
index d1052df8..336920a2 100644
--- a/src/projectile/boneProjectile.c
+++ b/src/projectile/boneProjectile.c
@@ -23,7 +23,7 @@ void BoneProjectile_OnTick(Entity* this) {
}
void BoneProjectile_OnCollision(Entity* this) {
- if (this->contactFlags == CONTACT_TAKE_DAMAGE) {
+ if (this->contactFlags == CONTACT_NOW) {
DeleteEntity(this);
} else {
sub_080A82D8(this);
diff --git a/src/projectile/darkNutSwordSlash.c b/src/projectile/darkNutSwordSlash.c
index 838435e5..1b09cf4b 100644
--- a/src/projectile/darkNutSwordSlash.c
+++ b/src/projectile/darkNutSwordSlash.c
@@ -30,7 +30,7 @@ void DarkNutSwordSlash(Entity* this) {
if ((this->parent == NULL) || (this->parent->health == 0)) {
DeleteThisEntity();
}
- if (((this->contactFlags & CONTACT_TAKE_DAMAGE) != 0) && (this->contactedEntity == &gPlayerEntity.base)) {
+ if (((this->contactFlags & CONTACT_NOW) != 0) && (this->contactedEntity == &gPlayerEntity.base)) {
this->iframes = -0x2d;
}
this->contactFlags = 0;
diff --git a/src/projectile/dekuSeedProjectile.c b/src/projectile/dekuSeedProjectile.c
index c086f251..f3b2f5e7 100644
--- a/src/projectile/dekuSeedProjectile.c
+++ b/src/projectile/dekuSeedProjectile.c
@@ -24,7 +24,7 @@ void DekuSeedProjectile_OnTick(Entity* this) {
}
void DekuSeedProjectile_OnCollision(Entity* this) {
- if (this->contactFlags == CONTACT_TAKE_DAMAGE) {
+ if (this->contactFlags == CONTACT_NOW) {
if (this->hitType == 0x68) {
EnqueueSFX(SFX_86);
}
@@ -75,7 +75,7 @@ void DekuSeedProjectile_Action1(Entity* this) {
if ((parent->next != NULL) && (IsColliding(this, parent) != 0)) {
this->iframes = 0x10;
this->knockbackDirection = -this->direction;
- this->contactFlags = CONTACT_TAKE_DAMAGE;
+ this->contactFlags = CONTACT_NOW;
this->knockbackDuration = 0xc;
this->knockbackSpeed = 0;
parent->iframes = 0x10;
diff --git a/src/projectile/dirtBallProjectile.c b/src/projectile/dirtBallProjectile.c
index 2ef3867e..a03009de 100644
--- a/src/projectile/dirtBallProjectile.c
+++ b/src/projectile/dirtBallProjectile.c
@@ -41,7 +41,7 @@ void DirtBallProjectile_OnCollision(Entity* this) {
this->knockbackSpeed = 0;
if (this->type == 0) {
this->parent->child = NULL;
- if (this->contactFlags == CONTACT_TAKE_DAMAGE) {
+ if (this->contactFlags == CONTACT_NOW) {
gPlayerState.hurtBlinkSpeed = 0xf0;
ModHealth(-2);
}
diff --git a/src/projectile/gleerokProjectile.c b/src/projectile/gleerokProjectile.c
index d40d2a92..2b01180f 100644
--- a/src/projectile/gleerokProjectile.c
+++ b/src/projectile/gleerokProjectile.c
@@ -28,8 +28,7 @@ void GleerokProjectile(GleerokProjectileEntity* this) {
}
void GleerokProjectile_OnTick(GleerokProjectileEntity* this) {
- if (((super->type != 3) && ((super->contactFlags & CONTACT_TAKE_DAMAGE) != 0)) &&
- ((super->contactFlags & 0x7f) != 0x1e)) {
+ if (((super->type != 3) && ((super->contactFlags & CONTACT_NOW) != 0)) && ((super->contactFlags & 0x7f) != 0x1e)) {
super->action = 3;
COLLISION_OFF(super);
InitializeAnimation(super, 0x53);
diff --git a/src/projectile/guardLineOfSight.c b/src/projectile/guardLineOfSight.c
index dfb59237..d117507c 100644
--- a/src/projectile/guardLineOfSight.c
+++ b/src/projectile/guardLineOfSight.c
@@ -26,7 +26,7 @@ void GuardLineOfSight(Entity* this) {
this->timer = Random();
this->spriteSettings.draw = 0;
}
- if (this->contactFlags == CONTACT_TAKE_DAMAGE) {
+ if (this->contactFlags == CONTACT_NOW) {
if (this->parent != NULL) {
this->parent->type = 0xff;
}
@@ -58,7 +58,7 @@ void GuardLineOfSight(Entity* this) {
this->hitbox = (Hitbox*)&gUnk_080FD1E4;
InitializeAnimation(this, 0);
}
- if (this->contactFlags == CONTACT_TAKE_DAMAGE) {
+ if (this->contactFlags == CONTACT_NOW) {
if (this->parent != NULL) {
this->parent->type = 0xff;
}
diff --git a/src/projectile/keatonDagger.c b/src/projectile/keatonDagger.c
index 6a4b66c3..cf1fa109 100644
--- a/src/projectile/keatonDagger.c
+++ b/src/projectile/keatonDagger.c
@@ -20,7 +20,7 @@ void KeatonDagger(Entity* this) {
}
parent = this->parent;
if (((parent == NULL) || (parent->health == 0)) || (parent->next == NULL)) {
- if (((this->contactFlags & CONTACT_TAKE_DAMAGE) != 0) && (this->contactedEntity == &gPlayerEntity.base)) {
+ if (((this->contactFlags & CONTACT_NOW) != 0) && (this->contactedEntity == &gPlayerEntity.base)) {
sub_0803C0AC(this);
}
DeleteEntity(this);
diff --git a/src/projectile/lakituLightning.c b/src/projectile/lakituLightning.c
index 47d300a7..279ef9e9 100644
--- a/src/projectile/lakituLightning.c
+++ b/src/projectile/lakituLightning.c
@@ -23,7 +23,7 @@ void LakituLightning_OnTick(Entity* this) {
}
void LakituLightning_OnCollision(Entity* this) {
- if ((this->health == 0) || (this->contactFlags == CONTACT_TAKE_DAMAGE)) {
+ if ((this->health == 0) || (this->contactFlags == CONTACT_NOW)) {
DeleteThisEntity();
}
LakituLightning_OnTick(this);
diff --git a/src/projectile/mandiblesProjectile.c b/src/projectile/mandiblesProjectile.c
index 64142a9c..2b6f67a3 100644
--- a/src/projectile/mandiblesProjectile.c
+++ b/src/projectile/mandiblesProjectile.c
@@ -55,7 +55,7 @@ void MandiblesProjectile_OnTick(MandiblesProjectileEntity* this) {
void MandiblesProjectile_OnCollision(MandiblesProjectileEntity* this) {
Entity* parent;
- if ((super->contactFlags & CONTACT_TAKE_DAMAGE) != 0) {
+ if ((super->contactFlags & CONTACT_NOW) != 0) {
switch (super->action) {
case 4:
super->subtimer = 0;
diff --git a/src/projectile/moblinSpear.c b/src/projectile/moblinSpear.c
index 076477b0..2e58a091 100644
--- a/src/projectile/moblinSpear.c
+++ b/src/projectile/moblinSpear.c
@@ -38,7 +38,7 @@ void MoblinSpear_OnTick(Entity* this) {
void MoblinSpear_OnCollision(Entity* this) {
u8 tmp;
- if (this->contactFlags == CONTACT_TAKE_DAMAGE) {
+ if (this->contactFlags == CONTACT_NOW) {
this->iframes = 0x10;
this->knockbackDuration = 0xc;
this->knockbackSpeed = 0x180;
diff --git a/src/projectile/octorokBossProjectile.c b/src/projectile/octorokBossProjectile.c
index 43982f37..8ca0d67d 100644
--- a/src/projectile/octorokBossProjectile.c
+++ b/src/projectile/octorokBossProjectile.c
@@ -99,7 +99,7 @@ void OctorokBossProjectile_Action1(OctorokBossProjectileEntity* this) {
if (super->parent->action == 2) {
DeleteThisEntity();
}
- if ((super->type2 == 0) && ((super->contactFlags & CONTACT_TAKE_DAMAGE) != 0)) {
+ if ((super->type2 == 0) && ((super->contactFlags & CONTACT_NOW) != 0)) {
if ((super->contactFlags & 0x7f) == 0) {
OctorokBossProjectile_Action2(this);
}
@@ -182,7 +182,7 @@ void OctorokBossProjectile_Action1(OctorokBossProjectileEntity* this) {
if (--*(u32*)&this->unk_78 == -1) {
OctorokBossProjectile_Action2(this);
}
- if ((super->contactFlags & CONTACT_TAKE_DAMAGE) == 0) {
+ if ((super->contactFlags & CONTACT_NOW) == 0) {
return;
}
OctorokBossProjectile_Action2(this);
diff --git a/src/projectile/projectile5.c b/src/projectile/projectile5.c
index 379dd97d..4fa9a3d8 100644
--- a/src/projectile/projectile5.c
+++ b/src/projectile/projectile5.c
@@ -41,7 +41,7 @@ void Projectile5_OnCollision(Entity* this) {
if ((((Projectile5Entity*)this->parent)->unk_83 & 0x3f) == 3) {
if (gPlayerState.hurtBlinkSpeed != 0) {
if (sub_080B1B44(TILE(this->x.HALF.HI, this->y.HALF.HI), gPlayerEntity.base.collisionLayer) == 0) {
- if (this->contactFlags == CONTACT_TAKE_DAMAGE) {
+ if (this->contactFlags == CONTACT_NOW) {
*pbVar2 = *pbVar2 & 0x7f;
DeleteThisEntity();
}
diff --git a/src/projectile/removableDust.c b/src/projectile/removableDust.c
index e89cd3b4..49da5582 100644
--- a/src/projectile/removableDust.c
+++ b/src/projectile/removableDust.c
@@ -51,7 +51,7 @@ void RemovableDust_OnTick(RemovableDustEntity* this) {
}
void RemovableDust_OnCollision(RemovableDustEntity* this) {
- if (super->contactFlags == (CONTACT_TAKE_DAMAGE | 0x16)) {
+ if (super->contactFlags == (CONTACT_NOW | 0x16)) {
RemovableDust_OnGrabbed(this);
}
}
diff --git a/src/projectile/rockProjectile.c b/src/projectile/rockProjectile.c
index 7dc35d0c..a2e75f11 100644
--- a/src/projectile/rockProjectile.c
+++ b/src/projectile/rockProjectile.c
@@ -22,7 +22,7 @@ void RockProjectile_OnTick(Entity* this) {
}
void RockProjectile_OnCollision(Entity* this) {
- if (this->contactFlags == CONTACT_TAKE_DAMAGE) {
+ if (this->contactFlags == CONTACT_NOW) {
DeleteEntity(this);
} else {
this->direction = this->knockbackDirection;
diff --git a/src/projectile/spiderWeb.c b/src/projectile/spiderWeb.c
index c1cb7adc..b749caf4 100644
--- a/src/projectile/spiderWeb.c
+++ b/src/projectile/spiderWeb.c
@@ -64,7 +64,7 @@ void SpiderWeb_OnCollision(SpiderWebEntity* this) {
};
Entity* object;
- if (super->contactFlags == (CONTACT_TAKE_DAMAGE | 0x7)) {
+ if (super->contactFlags == (CONTACT_NOW | 0x7)) {
super->action = 3;
super->timer = 90;
COLLISION_OFF(super);
diff --git a/src/projectile/stalfosProjectile.c b/src/projectile/stalfosProjectile.c
index 660b8f5c..bbe7b728 100644
--- a/src/projectile/stalfosProjectile.c
+++ b/src/projectile/stalfosProjectile.c
@@ -35,7 +35,7 @@ void StalfosProjectile_OnTick(Entity* this) {
}
void StalfosProjectile_OnCollision(Entity* this) {
- if (this->contactFlags == (CONTACT_TAKE_DAMAGE | 0x1d)) {
+ if (this->contactFlags == (CONTACT_NOW | 0x1d)) {
this->action = 3;
COLLISION_OFF(this);
this->zVelocity = Q_16_16(2.625);
diff --git a/src/projectile/v1DarkMagicProjectile.c b/src/projectile/v1DarkMagicProjectile.c
index eb5f73cc..dd3d1d0b 100644
--- a/src/projectile/v1DarkMagicProjectile.c
+++ b/src/projectile/v1DarkMagicProjectile.c
@@ -43,7 +43,7 @@ void V1DarkMagicProjectile_OnTick(V1DarkMagicProjectileEntity* this) {
}
void V1DarkMagicProjectile_OnCollision(V1DarkMagicProjectileEntity* this) {
- if ((super->contactFlags & CONTACT_TAKE_DAMAGE) != 0) {
+ if ((super->contactFlags & CONTACT_NOW) != 0) {
if (super->type2 == 0) {
if ((super->contactFlags & 0x3f) == 0) {
super->action = 2;
diff --git a/src/projectile/v1FireProjectile.c b/src/projectile/v1FireProjectile.c
index 661547ba..9fa0260f 100644
--- a/src/projectile/v1FireProjectile.c
+++ b/src/projectile/v1FireProjectile.c
@@ -31,7 +31,7 @@ void V1FireProjectile_OnTick(V1FireProjectileEntity* this) {
}
void V1FireProjectile_OnCollision(V1FireProjectileEntity* this) {
- if ((super->contactFlags & CONTACT_TAKE_DAMAGE) != 0) {
+ if ((super->contactFlags & CONTACT_NOW) != 0) {
super->action = 3;
COLLISION_OFF(super);
InitializeAnimation(super, 0x53);
diff --git a/src/projectile/v2Projectile.c b/src/projectile/v2Projectile.c
index 8f7531c4..68759c91 100644
--- a/src/projectile/v2Projectile.c
+++ b/src/projectile/v2Projectile.c
@@ -43,7 +43,7 @@ void V2Projectile_OnTick(V2ProjectileEntity* this) {
}
void V2Projectile_OnCollision(V2ProjectileEntity* this) {
- if ((super->contactFlags & CONTACT_TAKE_DAMAGE) == 0)
+ if ((super->contactFlags & CONTACT_NOW) == 0)
return;
switch (super->type) {
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 03:20:06 +0000