diff --git a/asm/non_matching/mazaal/sub_08034A10.inc b/asm/non_matching/mazaal/sub_08034A10.inc deleted file mode 100644 index 0b1bacf8..00000000 --- a/asm/non_matching/mazaal/sub_08034A10.inc +++ /dev/null @@ -1,67 +0,0 @@ - - .syntax unified - push {r4, lr} - adds r1, r0, #0 - adds r3, r1, #0 - adds r3, #0x7d - ldrb r2, [r3] - movs r0, #0x60 - ands r0, r2 - cmp r0, #0x40 - beq _08034A52 - movs r0, #0x10 - ands r0, r2 - cmp r0, #0 - beq _08034A56 - adds r4, r1, #0 - adds r4, #0x80 - ldrb r1, [r4] - movs r0, #5 - ands r0, r1 - cmp r0, #0 - beq _08034A3E - movs r0, #0x40 - orrs r0, r2 - strb r0, [r3] -_08034A3E: - ldrb r1, [r4] - movs r0, #0xa - ands r0, r1 - cmp r0, #0 - beq _08034A7E - ldrb r1, [r3] - movs r0, #3 - ands r0, r1 - cmp r0, #1 - bne _08034A7E -_08034A52: - movs r0, #1 - b _08034A80 -_08034A56: - adds r4, r1, #0 - adds r4, #0x80 - ldrb r1, [r4] - movs r0, #0xa - ands r0, r1 - cmp r0, #0 - beq _08034A6A - movs r0, #0x40 - orrs r0, r2 - strb r0, [r3] -_08034A6A: - ldrb r1, [r4] - movs r0, #5 - ands r0, r1 - cmp r0, #0 - beq _08034A7E - ldrb r1, [r3] - movs r0, #3 - ands r0, r1 - cmp r0, #2 - beq _08034A52 -_08034A7E: - movs r0, #0 -_08034A80: - pop {r4, pc} - .align 2, 0 - .syntax divided diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c index 83df6197..af37d745 100644 --- a/src/enemy/mazaalHead.c +++ b/src/enemy/mazaalHead.c @@ -700,14 +700,14 @@ u32 sub_080349D8(Entity* this) { } } -NONMATCH("asm/non_matching/mazaal/sub_08034A10.inc", u32 sub_08034A10(Entity* this)) { +u32 sub_08034A10(Entity* this) { if ((this->field_0x7c.BYTES.byte1 & 0x60) != 0x40) { if ((this->field_0x7c.BYTES.byte1 & 0x10) != 0) { if ((this->field_0x80.HALF.LO & 5) != 0) { this->field_0x7c.BYTES.byte1 |= 0x40; } - if (((this->field_0x80.HALF.LO & 10) == 0) || ((this->field_0x7c.BYTES.byte1 & 3) != 1)) { - return 0; + if (((this->field_0x80.HALF.LO & 10) != 0) && ((this->field_0x7c.BYTES.byte1 & 3) == 1)) { + return 1; } } else { if ((this->field_0x80.HALF.LO & 10) != 0) { @@ -716,14 +716,15 @@ NONMATCH("asm/non_matching/mazaal/sub_08034A10.inc", u32 sub_08034A10(Entity* th if ((this->field_0x80.HALF.LO & 5) == 0) { return 0; } - if ((this->field_0x7c.BYTES.byte1 & 3) != 2) { - return 0; + if ((this->field_0x7c.BYTES.byte1 & 3) == 2) { + return 1; } } + } else { + return 1; } - return 1; + return 0; } -END_NONMATCH void sub_08034A84(Entity* this) { if (this->parent->next == NULL) {