through sub_815DEFC

This commit is contained in:
PikalaxALT 2019-01-02 19:54:52 -05:00
parent c085d97f4d
commit 50c3065ec0
3 changed files with 271 additions and 232 deletions

View File

@ -5,236 +5,6 @@
.text
thumb_func_start sub_815DDB0
sub_815DDB0: @ 815DDB0
push {r4-r6,lr}
ldr r0, _0815DDD0 @ =gUnknown_203F458
ldr r2, [r0]
ldrb r1, [r2]
lsls r0, r1, 5
subs r0, r1
lsls r0, 5
adds r2, r0
ldrb r0, [r2, 0xE]
cmp r0, 0x1
beq _0815DE18
cmp r0, 0x1
bgt _0815DDD4
cmp r0, 0
beq _0815DDDA
b _0815DEF0
.align 2, 0
_0815DDD0: .4byte gUnknown_203F458
_0815DDD4:
cmp r0, 0x2
beq _0815DE64
b _0815DEF0
_0815DDDA:
ldrb r2, [r2, 0x1B]
movs r3, 0
ldr r0, _0815DE04 @ =gUnknown_8479ED8
ldrb r1, [r0, 0x1]
adds r6, r0, 0
cmp r1, r2
beq _0815DDF8
adds r1, r6, 0
_0815DDEA:
adds r1, 0x4
adds r3, 0x1
cmp r3, 0x52
bhi _0815DDF8
ldrb r0, [r1, 0x1]
cmp r0, r2
bne _0815DDEA
_0815DDF8:
cmp r3, 0x53
beq _0815DE08
lsls r0, r3, 2
adds r0, r6
ldrb r1, [r0]
b _0815DE0A
.align 2, 0
_0815DE04: .4byte gUnknown_8479ED8
_0815DE08:
movs r1, 0x12
_0815DE0A:
ldr r0, _0815DE14 @ =0x00004011
bl VarSet
b _0815DEF0
.align 2, 0
_0815DE14: .4byte 0x00004011
_0815DE18:
ldrb r2, [r2, 0x1B]
movs r3, 0
ldr r0, _0815DE44 @ =gUnknown_847A024
ldrb r1, [r0, 0x2]
adds r4, r0, 0
cmp r1, r2
beq _0815DE36
adds r1, r4, 0
_0815DE28:
adds r1, 0x8
adds r3, 0x1
cmp r3, 0x9
bhi _0815DE36
ldrb r0, [r1, 0x2]
cmp r0, r2
bne _0815DE28
_0815DE36:
cmp r3, 0xA
beq _0815DE48
lsls r0, r3, 3
adds r0, r4
ldrb r1, [r0]
ldrb r4, [r0, 0x1]
b _0815DE4C
.align 2, 0
_0815DE44: .4byte gUnknown_847A024
_0815DE48:
movs r1, 0x12
movs r4, 0x12
_0815DE4C:
ldr r0, _0815DE5C @ =0x00004010
bl VarSet
ldr r0, _0815DE60 @ =0x00004013
adds r1, r4, 0
bl VarSet
b _0815DEF0
.align 2, 0
_0815DE5C: .4byte 0x00004010
_0815DE60: .4byte 0x00004013
_0815DE64:
movs r4, 0
ldr r6, _0815DEAC @ =gUnknown_8479ED8
_0815DE68:
ldr r0, _0815DEB0 @ =gUnknown_203F458
ldr r3, [r0]
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
adds r1, r4
lsls r1, 3
ldrb r2, [r3]
lsls r0, r2, 5
subs r0, r2
lsls r0, 5
adds r1, r0
adds r3, r1
ldrb r2, [r3, 0x1B]
movs r3, 0
ldr r1, _0815DEAC @ =gUnknown_8479ED8
ldrb r0, [r1, 0x1]
adds r5, r4, 0x1
cmp r0, r2
beq _0815DE9E
_0815DE90:
adds r1, 0x4
adds r3, 0x1
cmp r3, 0x52
bhi _0815DE9E
ldrb r0, [r1, 0x1]
cmp r0, r2
bne _0815DE90
_0815DE9E:
cmp r3, 0x53
beq _0815DEB4
lsls r0, r3, 2
adds r0, r6
ldrb r1, [r0]
b _0815DEB6
.align 2, 0
_0815DEAC: .4byte gUnknown_8479ED8
_0815DEB0: .4byte gUnknown_203F458
_0815DEB4:
movs r1, 0x12
_0815DEB6:
cmp r4, 0x1
beq _0815DED8
cmp r4, 0x1
bgt _0815DEC4
cmp r4, 0
beq _0815DECA
b _0815DEEA
_0815DEC4:
cmp r4, 0x2
beq _0815DEE4
b _0815DEEA
_0815DECA:
ldr r0, _0815DED4 @ =0x00004012
bl VarSet
b _0815DEEA
.align 2, 0
_0815DED4: .4byte 0x00004012
_0815DED8:
ldr r0, _0815DEE0 @ =0x00004010
bl VarSet
b _0815DEEA
.align 2, 0
_0815DEE0: .4byte 0x00004010
_0815DEE4:
ldr r0, _0815DEF8 @ =0x00004011
bl VarSet
_0815DEEA:
adds r4, r5, 0
cmp r4, 0x2
ble _0815DE68
_0815DEF0:
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0815DEF8: .4byte 0x00004011
thumb_func_end sub_815DDB0
thumb_func_start sub_815DEFC
sub_815DEFC: @ 815DEFC
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x3
movs r3, 0x2
bl ConvertEasyChatWordsToString
movs r2, 0x1
negs r2, r2
movs r0, 0x2
adds r1, r4, 0
bl GetStringWidth
cmp r0, 0xC4
bls _0815DF4E
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x2
movs r3, 0x3
bl ConvertEasyChatWordsToString
ldrb r0, [r4]
movs r1, 0x1
cmp r0, 0xFE
beq _0815DF40
_0815DF32:
adds r0, r4, r1
ldrb r0, [r0]
adds r1, 0x1
cmp r0, 0xFE
bne _0815DF32
b _0815DF40
_0815DF3E:
adds r1, 0x1
_0815DF40:
adds r0, r4, r1
ldrb r0, [r0]
cmp r0, 0xFE
bne _0815DF3E
adds r1, r4, r1
movs r0, 0xFA
strb r0, [r1]
_0815DF4E:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_815DEFC
thumb_func_start sub_815DF54
sub_815DF54: @ 815DF54
push {r4,r5,lr}

View File

@ -374,9 +374,174 @@ gUnknown_8479D34::
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
gUnknown_8479ED8:: @ 8479ED8
.incbin "baserom.gba", 0x479ED8, 0x14C
.align 2
.byte 0x1c, 0x03, 0x01
.align 2
.byte 0x38, 0x04, 0x00
.align 2
.byte 0x25, 0x06, 0x01
.align 2
.byte 0x26, 0x07, 0x00
.align 2
.byte 0x29, 0x08, 0x00
.align 2
.byte 0x2a, 0x09, 0x01
.align 2
.byte 0x34, 0x0a, 0x00
.align 2
.byte 0x1c, 0x0b, 0x01
.align 2
.byte 0x1d, 0x0c, 0x01
.align 2
.byte 0x13, 0x0d, 0x00
.align 2
.byte 0x34, 0x0e, 0x00
.align 2
.byte 0x2d, 0x0f, 0x00
.align 2
.byte 0x36, 0x10, 0x00
.align 2
.byte 0x1a, 0x11, 0x00
.align 2
.byte 0x1a, 0x12, 0x00
.align 2
.byte 0x27, 0x13, 0x00
.align 2
.byte 0x34, 0x14, 0x00
.align 2
.byte 0x13, 0x15, 0x00
.align 2
.byte 0x17, 0x16, 0x01
.align 2
.byte 0x3d, 0x17, 0x00
.align 2
.byte 0x13, 0x1d, 0x00
.align 2
.byte 0x17, 0x1e, 0x01
.align 2
.byte 0x1e, 0x20, 0x00
.align 2
.byte 0x1f, 0x21, 0x01
.align 2
.byte 0x20, 0x22, 0x00
.align 2
.byte 0x23, 0x23, 0x01
.align 2
.byte 0x12, 0x24, 0x00
.align 2
.byte 0x39, 0x26, 0x00
.align 2
.byte 0x29, 0x2d, 0x00
.align 2
.byte 0x1a, 0x2e, 0x00
.align 2
.byte 0x10, 0x2f, 0x00
.align 2
.byte 0x18, 0x30, 0x01
.align 2
.byte 0x1d, 0x31, 0x01
.align 2
.byte 0x2e, 0x32, 0x01
.align 2
.byte 0x28, 0x33, 0x01
.align 2
.byte 0x3e, 0x35, 0x00
.align 2
.byte 0x1b, 0x38, 0x00
.align 2
.byte 0x19, 0x40, 0x00
.align 2
.byte 0x1c, 0x41, 0x01
.align 2
.byte 0x27, 0x42, 0x00
.align 2
.byte 0x28, 0x43, 0x01
.align 2
.byte 0x16, 0x47, 0x01
.align 2
.byte 0x14, 0x48, 0x00
.align 2
.byte 0x38, 0x49, 0x00
.align 2
.byte 0x12, 0x58, 0x00
.align 2
.byte 0x14, 0x59, 0x00
.align 2
.byte 0x16, 0x5a, 0x01
.align 2
.byte 0x3e, 0x5b, 0x00
.align 2
.byte 0x27, 0x5c, 0x00
.align 2
.byte 0x28, 0x5d, 0x01
.align 2
.byte 0x34, 0x5e, 0x00
.align 2
.byte 0x34, 0x5f, 0x00
.align 2
.byte 0x38, 0x60, 0x00
.align 2
.byte 0x35, 0x61, 0x00
.align 2
.byte 0x34, 0x62, 0x00
.align 2
.byte 0x1e, 0x63, 0x00
.align 2
.byte 0x39, 0x64, 0x00
.align 2
.byte 0x2d, 0x65, 0x00
.align 2
.byte 0x35, 0x66, 0x00
.align 2
.byte 0x20, 0x67, 0x00
.align 2
.byte 0x1d, 0x68, 0x01
.align 2
.byte 0x2e, 0x69, 0x01
.align 2
.byte 0x13, 0x6a, 0x00
.align 2
.byte 0x1a, 0x6b, 0x00
.align 2
.byte 0x1a, 0x6c, 0x00
.align 2
.byte 0x19, 0x6d, 0x00
.align 2
.byte 0x1a, 0x6e, 0x00
.align 2
.byte 0x36, 0x6f, 0x00
.align 2
.byte 0x37, 0x71, 0x00
.align 2
.byte 0x29, 0x74, 0x00
.align 2
.byte 0x2a, 0x75, 0x01
.align 2
.byte 0x3d, 0x7a, 0x00
.align 2
.byte 0x3a, 0x7d, 0x01
.align 2
.byte 0x17, 0x89, 0x01
.align 2
.byte 0x18, 0x8a, 0x01
.align 2
.byte 0x25, 0x8b, 0x01
.align 2
.byte 0x1c, 0x8c, 0x01
.align 2
.byte 0x27, 0x8d, 0x00
.align 2
.byte 0x28, 0x8e, 0x01
.align 2
.byte 0x1c, 0x8f, 0x01
.align 2
.byte 0x38, 0x90, 0x00
.align 2
.byte 0x1c, 0x91, 0x01
.align 2
.byte 0x16, 0x92, 0x01
.align 2
gUnknown_847A024:: @ 847A024
.byte 0x1d, 0x17, 0x1f, 0x01, 0x01
.align 2

View File

@ -9,6 +9,8 @@
#include "event_data.h"
#include "random.h"
#include "cereader_tool.h"
#include "easy_chat.h"
#include "text.h"
#include "overworld.h"
struct UnkStruct_8479D34
@ -72,6 +74,22 @@ struct UnkStruct_203F45C
/* 0x3E */ u8 unk_3E;
};
struct UnkStruct_8479ED8
{
u8 unk0;
u8 unk1;
bool8 unk2;
};
struct UnkStruct_847A024
{
u8 unk0;
u8 unk1;
u8 unk2;
bool8 unk3;
bool8 unk4;
};
EWRAM_DATA struct UnkStruct_203F458 * gUnknown_203F458 = NULL;
EWRAM_DATA struct UnkStruct_203F45C * gUnknown_203F45C = NULL;
@ -109,6 +127,8 @@ extern void (*const gUnknown_847A230[])(void);
extern const struct Unk_203F458_Header gUnknown_84827AC;
extern const struct UnkSubstruct_203F458_000C *const gUnknown_84827B4[][8];
extern const u16 gUnknown_847A284[8][3];
extern const struct UnkStruct_8479ED8 gUnknown_8479ED8[83];
extern const struct UnkStruct_847A024 gUnknown_847A024[10];
bool32 sub_815D7BC(void * dest, void * buffer)
{
@ -417,3 +437,87 @@ void sub_815DD44(void)
sub_815DDB0();
}
}
void sub_815DDB0(void)
{
s32 r3, r4;
u8 r1, r2, r4_;
switch (gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_002)
{
case 0:
r2 = gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_004[0].unk_00B;
for (r3 = 0; r3 < NELEMS(gUnknown_8479ED8); r3++)
{
if (gUnknown_8479ED8[r3].unk1 == r2)
break;
}
if (r3 != NELEMS(gUnknown_8479ED8))
r1 = gUnknown_8479ED8[r3].unk0;
else
r1 = 18;
VarSet(VAR_0x4011, r1);
break;
case 1:
r2 = gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_004[0].unk_00B;
for (r3 = 0; r3 < NELEMS(gUnknown_847A024); r3++)
{
if (gUnknown_847A024[r3].unk2 == r2)
break;
}
if (r3 != NELEMS(gUnknown_847A024))
{
r1 = gUnknown_847A024[r3].unk0;
r4_ = gUnknown_847A024[r3].unk1;
}
else
{
r1 = 18;
r4_ = 18;
}
VarSet(VAR_0x4010, r1);
VarSet(VAR_0x4013, r4_);
break;
case 2:
for (r4 = 0; r4 < 3; r4++)
{
r2 = gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_004[r4].unk_00B;
for (r3 = 0; r3 < NELEMS(gUnknown_8479ED8); r3++)
{
if (gUnknown_8479ED8[r3].unk1 == r2)
break;
}
if (r3 != NELEMS(gUnknown_8479ED8))
r1 = gUnknown_8479ED8[r3].unk0;
else
r1 = 18;
switch (r4)
{
case 0:
VarSet(VAR_0x4012, r1);
break;
case 1:
VarSet(VAR_0x4010, r1);
break;
case 2:
VarSet(VAR_0x4011, r1);
break;
}
}
}
}
void sub_815DEFC(u16 * ecWords, u8 * dest)
{
s32 r1;
ConvertEasyChatWordsToString(dest, ecWords, 3, 2);
if ((unsigned)GetStringWidth(2, dest, -1) > 196)
{
ConvertEasyChatWordsToString(dest, ecWords, 2, 3);
r1 = 0;
while (dest[r1++] != CHAR_NEWLINE)
;
while (dest[r1] != CHAR_NEWLINE)
r1++;
dest[r1] = CHAR_PROMPT_SCROLL;
}
}