summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authornotyourav <65437533+notyourav@users.noreply.github.com>2022-01-11 19:57:15 -0800
committerGitHub <noreply@github.com>2022-01-11 19:57:15 -0800
commit3cd77bb034288fff3a0e674de41217fe277b6804 (patch)
tree38fdc835226b9a543a5438930978dfd1843d785e /src
parent7c2153f2f9630c98814d9360a4e932d6ce125464 (diff)
parent9fa3217cdba640cde6e2f1f92222eca79ccbf8ec (diff)
Merge pull request #290 from nonmatch/patch-25
Match sub_08034B38
Diffstat (limited to 'src')
-rw-r--r--src/enemy/mazaalHead.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c
index df3c0a3b..2fb9bcee 100644
--- a/src/enemy/mazaalHead.c
+++ b/src/enemy/mazaalHead.c
@@ -769,7 +769,7 @@ void sub_08034B0C(Entity* this) {
}
}
-NONMATCH("asm/non_matching/mazaal/sub_08034B38.inc", void sub_08034B38(Entity* this)) {
+void sub_08034B38(Entity* this) {
Entity* target;
const s8* ptr;
@@ -779,7 +779,7 @@ NONMATCH("asm/non_matching/mazaal/sub_08034B38.inc", void sub_08034B38(Entity* t
} else {
target = CreateProjectile(0xe);
if (target != NULL) {
- target->type -= 2;
+ target->type = this->type - 2;
if (target->type == 0) {
target->direction = 0xa8 - this->actionDelay;
} else {
@@ -790,7 +790,6 @@ NONMATCH("asm/non_matching/mazaal/sub_08034B38.inc", void sub_08034B38(Entity* t
}
}
}
-END_NONMATCH
void sub_08034BA0(Entity* this) {
GetNextFrame(this);