through sub_800D5D0

This commit is contained in:
PikalaxALT 2017-11-30 08:43:04 -05:00
parent f3ad97ad13
commit f974812e9b
2 changed files with 31 additions and 67 deletions

View file

@ -5,73 +5,6 @@
.text
thumb_func_start sub_800D594
sub_800D594: @ 800D594
push {lr}
lsls r0, 16
lsrs r2, r0, 16
ldr r0, =gUnknown_03007890
ldr r0, [r0]
ldrb r1, [r0, 0x4]
ldrb r0, [r0, 0x5]
orrs r0, r1
cmp r0, 0
bne _0800D5B8
ldr r0, =gUnknown_03004140
strh r2, [r0, 0x18]
movs r0, 0
b _0800D5C8
.pool
_0800D5B8:
ldr r1, =gUnknown_03004140
movs r0, 0x6
strh r0, [r1, 0x14]
movs r0, 0xF3
movs r1, 0x1
bl sub_800D30C
movs r0, 0x6
_0800D5C8:
pop {r1}
bx r1
.pool
thumb_func_end sub_800D594
thumb_func_start sub_800D5D0
sub_800D5D0: @ 800D5D0
push {lr}
lsls r0, 24
lsrs r2, r0, 24
adds r3, r2, 0
ldr r1, =gUnknown_03004140
ldrb r0, [r1, 0x4]
subs r0, 0x9
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
bhi _0800D5FC
movs r0, 0x7
strh r0, [r1, 0x14]
movs r0, 0xF3
movs r1, 0x1
bl sub_800D30C
movs r0, 0x7
b _0800D60A
.pool
_0800D5FC:
cmp r2, 0
beq _0800D606
movs r0, 0x1
strb r0, [r1, 0xB]
b _0800D608
_0800D606:
strb r3, [r1, 0xB]
_0800D608:
movs r0, 0
_0800D60A:
pop {r1}
bx r1
thumb_func_end sub_800D5D0
thumb_func_start sub_800D610
sub_800D610: @ 800D610
push {lr}

View file

@ -1331,3 +1331,34 @@ u8 sub_800D550(u8 a0, u16 a1)
REG_IME = imeBak;
return 0;
}
u8 sub_800D594(u16 a0)
{
if (gUnknown_03007890->unk_04 | gUnknown_03007890->unk_05)
{
gUnknown_03004140.unk_14 = 6;
sub_800D30C(0xf3, 0x01);
return 6;
}
gUnknown_03004140.unk_18 = a0;
return 0;
}
u8 sub_800D5D0(u8 a0)
{
if (gUnknown_03004140.unk_04 == 9 || gUnknown_03004140.unk_04 == 10 || gUnknown_03004140.unk_04 == 11)
{
gUnknown_03004140.unk_14 = 7;
sub_800D30C(0xf3, 0x01);
return 7;
}
if (a0)
{
gUnknown_03004140.unk_0b = 1;
}
else
{
gUnknown_03004140.unk_0b = 0;
}
return 0;
}