Match sub_08026F1C

This commit is contained in:
Tal Hayon 2022-07-17 08:43:39 +03:00
parent 204bc4e9a4
commit 2fe066b64e
2 changed files with 20 additions and 69 deletions

View File

@ -8,75 +8,6 @@
thumb_func_start sub_08026F1C
sub_08026F1C: @ 0x08026F1C
push {r4, r5, lr}
sub sp, #4
adds r4, r0, #0
adds r5, r4, #0
adds r5, #0x7c
ldrb r1, [r5]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _08026F70
adds r0, r4, #0
bl sub_080279E8
cmp r0, #0
beq _08026F68
adds r0, r4, #0
adds r0, #0x84
ldr r0, [r0]
movs r2, #0
strb r2, [r0, #3]
ldrb r1, [r5]
movs r0, #0xf
ands r0, r1
strb r0, [r5]
str r2, [sp]
adds r0, r4, #0
movs r1, #0x80
movs r2, #0x80
movs r3, #0x80
bl sub_08027B98
ldrb r0, [r5]
cmp r0, #2
bne _08026F68
adds r0, r4, #0
movs r1, #0
bl sub_08027548
_08026F68:
adds r0, r4, #0
bl sub_080277F8
b _08026FA0
_08026F70:
adds r0, r4, #0
movs r1, #0xf0
movs r2, #0x10
bl sub_080277B8
adds r0, r4, #0
adds r0, #0x84
ldr r0, [r0]
ldrb r0, [r0, #3]
cmp r0, #0
beq _08026FA0
ldrb r0, [r5]
adds r0, #1
movs r1, #0x80
orrs r0, r1
strb r0, [r5]
movs r0, #1
str r0, [sp]
adds r0, r4, #0
movs r1, #0xc0
movs r2, #0xc0
movs r3, #0x20
bl sub_08027B98
_08026FA0:
add sp, #4
pop {r4, r5, pc}
thumb_func_start sub_08026FA4
sub_08026FA4: @ 0x08026FA4
push {r4, r5, lr}

View File

@ -1116,3 +1116,23 @@ void sub_08026E1C(ChuchuBossEntity* this) {
sub_08078B48();
}
}
void sub_08026F1C(ChuchuBossEntity* this) {
if ((this->unk_7c & 0x80) != 0) {
if (sub_080279E8(this) != 0) {
this->unk_84->unk_03 = 0;
this->unk_7c &= 0xf;
sub_08027B98(this, 0x80, 0x80, 0x80, 0);
if (this->unk_7c == 2) {
sub_08027548(this, 0);
}
}
sub_080277F8(this);
} else {
sub_080277B8(this, 0xf0, 0x10);
if (this->unk_84->unk_03 != 0) {
this->unk_7c = (this->unk_7c + 1U) | 0x80;
sub_08027B98(this, 0xc0, 0xc0, 0x20, 1);
}
}
}