summaryrefslogtreecommitdiff
path: root/src/projectile
diff options
context:
space:
mode:
authorElliptic Ellipsis <elliptic.ellipsis@gmail.com>2022-03-18 23:16:15 +0000
committerElliptic Ellipsis <elliptic.ellipsis@gmail.com>2022-03-18 23:16:15 +0000
commit7780c76eac79febc6ad31a77e25637e2372522da (patch)
tree5310cb232f85b63dcff6f661c8c85fddb1d1af1b /src/projectile
parentd6c8cf025095f5e13d8dce1179bead030918320d (diff)
Correct type of sub_0806F520 and use it as a bool
Diffstat (limited to 'src/projectile')
-rw-r--r--src/projectile/lakituCloudProjectile.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/v2Projectile.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/projectile/lakituCloudProjectile.c b/src/projectile/lakituCloudProjectile.c
index f66dd20e..a766f97b 100644
--- a/src/projectile/lakituCloudProjectile.c
+++ b/src/projectile/lakituCloudProjectile.c
@@ -24,7 +24,7 @@ void nullsub_539(Entity* this) {
}
void sub_080A9CF0(Entity* this) {
- if (sub_0806F520() == 0) {
+ if (!sub_0806F520(this)) {
CreateFx(this, FX_DEATH, 0);
DeleteThisEntity();
}
diff --git a/src/projectile/spiderWeb.c b/src/projectile/spiderWeb.c
index 93951fad..8f24dae1 100644
--- a/src/projectile/spiderWeb.c
+++ b/src/projectile/spiderWeb.c
@@ -79,7 +79,7 @@ void sub_080AA78C(Entity* this) {
this->subAction = 1;
InitAnimationForceUpdate(this, animationState + 8);
}
- if (sub_0806F520(this) != 0) {
+ if (sub_0806F520(this)) {
UpdateAnimationSingleFrame(this);
if ((this->frame & 0x10) != 0) {
this->frame &= 0xef;
diff --git a/src/projectile/stalfosProjectile.c b/src/projectile/stalfosProjectile.c
index 841a68e3..3f8f679d 100644
--- a/src/projectile/stalfosProjectile.c
+++ b/src/projectile/stalfosProjectile.c
@@ -38,7 +38,7 @@ void sub_080A9A34(Entity* this) {
}
void sub_080A9A64(Entity* this) {
- if ((this->subAction < 3) && (sub_0806F520(this) == 0)) {
+ if ((this->subAction < 3) && !sub_0806F520(this)) {
sub_080A9BA8(this);
}
StalfosProjectile_SubActions[this->subAction](this);
diff --git a/src/projectile/v1DarkMagicProjectile.c b/src/projectile/v1DarkMagicProjectile.c
index aeca2aa3..8131c3d7 100644
--- a/src/projectile/v1DarkMagicProjectile.c
+++ b/src/projectile/v1DarkMagicProjectile.c
@@ -87,7 +87,7 @@ void sub_080AACE0(Entity* this) {
}
void sub_080AAD70(Entity* this) {
- if (sub_0806F520() == 0) {
+ if (!sub_0806F520(this)) {
this->health = 0;
}
V1DarkMagicProjectile_SubActions[this->subAction](this);
diff --git a/src/projectile/v2Projectile.c b/src/projectile/v2Projectile.c
index 3733945d..e2c86b53 100644
--- a/src/projectile/v2Projectile.c
+++ b/src/projectile/v2Projectile.c
@@ -62,7 +62,7 @@ void sub_080ABBF4(Entity* this) {
}
void sub_080ABC54(Entity* this) {
- if (sub_0806F520() == 0) {
+ if (!sub_0806F520(this)) {
CreateFx(this, FX_DEATH, 0);
DeleteThisEntity();
}