From 9fa3217cdba640cde6e2f1f92222eca79ccbf8ec Mon Sep 17 00:00:00 2001
From: hatal175 <hatal175@users.noreply.github.com>
Date: Tue, 11 Jan 2022 21:13:37 +0100
Subject: [PATCH] Match sub_08034B38

---
 asm/non_matching/mazaal/sub_08034B38.inc | 56 ------------------------
 src/enemy/mazaalHead.c                   |  5 +--
 2 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 asm/non_matching/mazaal/sub_08034B38.inc

diff --git a/asm/non_matching/mazaal/sub_08034B38.inc b/asm/non_matching/mazaal/sub_08034B38.inc
deleted file mode 100644
index 319ce862..00000000
--- a/asm/non_matching/mazaal/sub_08034B38.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-
-    .syntax unified
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08034B58
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0xa]
-	adds r1, #3
-	adds r0, r4, #0
-	bl InitializeAnimation
-	b _08034B9A
-_08034B58:
-	movs r0, #0xe
-	bl CreateProjectile
-	adds r5, r0, #0
-	cmp r5, #0
-	beq _08034B9A
-	ldrb r0, [r4, #0xa]
-	subs r0, #2
-	strb r0, [r5, #0xa]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08034B78
-	ldrb r1, [r4, #0xe]
-	movs r0, #0xa8
-	subs r0, r0, r1
-	b _08034B7C
-_08034B78:
-	ldrb r0, [r4, #0xe]
-	adds r0, #0x58
-_08034B7C:
-	strb r0, [r5, #0x15]
-	ldrb r0, [r5, #0xa]
-	lsls r0, r0, #1
-	ldr r1, _08034B9C @ =gUnk_080CED84
-	adds r0, r0, r1
-	movs r2, #0
-	ldrsb r2, [r0, r2]
-	lsls r2, r2, #0x10
-	movs r3, #1
-	ldrsb r3, [r0, r3]
-	lsls r3, r3, #0x10
-	adds r0, r4, #0
-	adds r1, r5, #0
-	bl PositionRelative
-_08034B9A:
-	pop {r4, r5, pc}
-	.align 2, 0
-_08034B9C: .4byte gUnk_080CED84
-    .syntax divided
diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c
index 6ca1ca83..5ae7061d 100644
--- a/src/enemy/mazaalHead.c
+++ b/src/enemy/mazaalHead.c
@@ -772,7 +772,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;
 
@@ -782,7 +782,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 {
@@ -793,7 +793,6 @@ NONMATCH("asm/non_matching/mazaal/sub_08034B38.inc", void sub_08034B38(Entity* t
         }
     }
 }
-END_NONMATCH
 
 void sub_08034BA0(Entity* this) {
     GetNextFrame(this);