summaryrefslogtreecommitdiff
path: root/src/enemy
diff options
context:
space:
mode:
authorIbot02 <jtp.jtp@gmx.de>2026-09-27 17:57:44 +0000
committerGitHub <noreply@github.com>2026-09-27 17:57:44 +0000
commit6fb6dfb4a7efbe24d0fd1dda5097af6131faacde (patch)
tree8d1e080989250a2806732e7a1a53d73c07024080 /src/enemy
parentd92d4581e202ae531bdcc206a7d6a90ddb8fd907 (diff)
parentecae1f4ded5f8e4eeb66ef6a20864132cc466ff5 (diff)
Merge pull request #708 from Henny022p/link-fireHEADmaster
document link fire
Diffstat (limited to 'src/enemy')
-rw-r--r--src/enemy/beetle.c2
-rw-r--r--src/enemy/enemy50.c2
-rw-r--r--src/enemy/ghini.c2
-rw-r--r--src/enemy/gibdo.c2
-rw-r--r--src/enemy/likeLike.c2
-rw-r--r--src/enemy/pesto.c2
-rw-r--r--src/enemy/rupeeLike.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c
index 934e308a..59932f30 100644
--- a/src/enemy/beetle.c
+++ b/src/enemy/beetle.c
@@ -237,7 +237,7 @@ void sub_08021B64(BeetleEntity* this) {
s32 iVar4 = 1;
if (gPlayerState.framestate != PL_STATE_JUMP && gPlayerState.framestate != PL_STATE_CAPE) {
- if (sub_0807953C())
+ if (PlayerInputPressed())
iVar4 = super->type * 3 + 8;
iVar4 = super->timer - iVar4;
diff --git a/src/enemy/enemy50.c b/src/enemy/enemy50.c
index 13aefd52..d0cc1eab 100644
--- a/src/enemy/enemy50.c
+++ b/src/enemy/enemy50.c
@@ -301,7 +301,7 @@ void Enemy50_Action9(Enemy50Entity* this) {
if ((super->frame & 1) != 0) {
sub_0803F6C0(this);
}
- if (sub_0807953C()) {
+ if (PlayerInputPressed()) {
this->unk_78 += 8;
}
if (gPlayerEntity.base.health == 0) {
diff --git a/src/enemy/ghini.c b/src/enemy/ghini.c
index 9fb7dd7c..9376f439 100644
--- a/src/enemy/ghini.c
+++ b/src/enemy/ghini.c
@@ -257,7 +257,7 @@ void Ghini_Action9(GhiniEntity* this) {
if ((super->frame & 1) != 0) {
sub_0803F6C0(this);
}
- if (sub_0807953C() != 0) {
+ if (PlayerInputPressed() != 0) {
this->unk_78 += 0xc;
}
if (gPlayerEntity.base.health == 0) {
diff --git a/src/enemy/gibdo.c b/src/enemy/gibdo.c
index a7ad5224..96dfe811 100644
--- a/src/enemy/gibdo.c
+++ b/src/enemy/gibdo.c
@@ -315,7 +315,7 @@ void sub_080379BC(GibdoEntity* this) {
}
bool32 sub_080379EC(GibdoEntity* this) {
- if (sub_0807953C() != 0) {
+ if (PlayerInputPressed() != 0) {
if (--super->timer == 0) {
sub_08037A58(this);
return TRUE;
diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c
index b69bfde1..e832d221 100644
--- a/src/enemy/likeLike.c
+++ b/src/enemy/likeLike.c
@@ -191,7 +191,7 @@ void sub_0802805C(LikeLikeEntity* this) {
UpdateAnimationVariableFrames(super, 2);
- if (sub_0807953C()) {
+ if (PlayerInputPressed()) {
u32 tmp2 = Random();
u32 tmp3 = super->subtimer + 1;
tmp3 += (tmp2 & 1);
diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c
index 86078197..372e16e8 100644
--- a/src/enemy/pesto.c
+++ b/src/enemy/pesto.c
@@ -832,7 +832,7 @@ u32 sub_08024E34(void) {
void sub_08024E4C(PestoEntity* this) {
if (this->unk_83 == 3) {
super->subtimer = ++super->subtimer & 0x1f;
- if (sub_0807953C()) {
+ if (PlayerInputPressed()) {
u32 r = Random();
this->unk_84++;
r &= 1;
diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c
index 7344e387..f96c6dde 100644
--- a/src/enemy/rupeeLike.c
+++ b/src/enemy/rupeeLike.c
@@ -171,7 +171,7 @@ void sub_0802953C(RupeeLikeEntity* this) {
sub_080296C8(this);
sub_080296C8(this);
- if (sub_0807953C() != 0) {
+ if (PlayerInputPressed() != 0) {
super->subtimer++;
}
if (super->timer != 0) {