falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match sub_08034A10

This commit is contained in:
hatal175 2022-01-13 01:45:25 +01:00
parent db40a8d833
commit 0a7dd3781d
2 changed files with 8 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
asm/non_matching/mazaal/sub_08034A10.inc
View File

@ -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

15
src/enemy/mazaalHead.c
View File

@ -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 & 0x60) != 0x40) {
if ((this->field_0x7c.BYTES.byte1 & 0x10) != 0) { if ((this->field_0x7c.BYTES.byte1 & 0x10) != 0) {
if ((this->field_0x80.HALF.LO & 5) != 0) { if ((this->field_0x80.HALF.LO & 5) != 0) {
this->field_0x7c.BYTES.byte1 |= 0x40; this->field_0x7c.BYTES.byte1 |= 0x40;
} }
if (((this->field_0x80.HALF.LO & 10) == 0) || ((this->field_0x7c.BYTES.byte1 & 3) != 1)) { if (((this->field_0x80.HALF.LO & 10) != 0) && ((this->field_0x7c.BYTES.byte1 & 3) == 1)) {
return 0; return 1;
} }
} else { } else {
if ((this->field_0x80.HALF.LO & 10) != 0) { 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) { if ((this->field_0x80.HALF.LO & 5) == 0) {
return 0; return 0;
} }
if ((this->field_0x7c.BYTES.byte1 & 3) != 2) { if ((this->field_0x7c.BYTES.byte1 & 3) == 2) {
return 0; return 1;
} }
} }
} else {
return 1;
} }
return 1; return 0;
} }
END_NONMATCH
void sub_08034A84(Entity* this) { void sub_08034A84(Entity* this) {
if (this->parent->next == NULL) { if (this->parent->next == NULL) {