diff options
| author | scnorton <scnorton@biociphers.org> | 2017-09-20 12:56:45 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-09-20 12:56:45 -0400 |
| commit | 5fb39d5ef9f7c19ecff2b347cf7785ea8fc63ad9 (patch) | |
| tree | aadf83c256b35408a2821766aadae9e54f6bb310 | |
| parent | fdea92edffb4360db50cb0e7dcc044dc7242defe (diff) | |
sub_818E3EC
| -rw-r--r-- | asm/lilycove_lady.s | 32 | ||||
| -rw-r--r-- | src/lilycove_lady.c | 14 |
2 files changed, 14 insertions, 32 deletions
diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index 72b321ef8..34b479c8a 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,38 +5,6 @@ .text - thumb_func_start sub_818E3EC -sub_818E3EC: @ 818E3EC - push {r4,lr} - ldr r4, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003b58 - adds r0, r1 - str r0, [r4] - bl sub_818E298 - lsls r0, 24 - cmp r0, 0 - beq _0818E41C - ldr r0, [r4] - adds r1, r0, 0 - adds r1, 0x2B - ldrb r1, [r1] - adds r0, 0x2C - b _0818E422 - .pool -_0818E41C: - ldr r0, [r4] - adds r0, 0x2C - movs r1, 0x10 -_0818E422: - strb r1, [r0] - bl sub_818DF00 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_818E3EC - thumb_func_start sub_818E430 sub_818E430: @ 818E430 push {r4,r5,lr} diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index c4a0b9c11..65f6e2e10 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -622,3 +622,17 @@ void sub_818E3E0(void) { sub_81AAC70(); } + +void sub_818E3EC(void) +{ + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + if (sub_818E298()) + { + gUnknown_0203CD68->unk_02c = gUnknown_0203CD68->unk_02b; + } + else + { + gUnknown_0203CD68->unk_02c = 0x10; + } + sub_818DF00(); +} |