diff options
| author | PikalaxALT <pikalax1@gmail.com> | 2017-09-20 20:24:22 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalax1@gmail.com> | 2017-09-20 20:24:22 -0400 |
| commit | c56b6fc9a46d92824b8eb6b61bc2dc1f525c0757 (patch) | |
| tree | d90cee10e3870f15baeb3fdbc33eef19315f0a96 | |
| parent | 45d53d9242e7c601546da894c4f95ffe99aedd17 (diff) | |
sub_818E794
| -rw-r--r-- | asm/lilycove_lady.s | 30 | ||||
| -rw-r--r-- | src/lilycove_lady.c | 9 |
2 files changed, 9 insertions, 30 deletions
diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index f3eca44e7..a3f455065 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,36 +5,6 @@ .text - thumb_func_start sub_818E794 -sub_818E794: @ 818E794 - push {r4,r5,lr} - adds r5, r1, 0 - ldr r4, =gUnknown_0203CD6C - ldr r1, =gSaveBlock1Ptr - ldr r1, [r1] - ldr r2, =0x00003b58 - adds r1, r2 - str r1, [r4] - ldr r2, =gUnknown_0860B324 - ldrb r1, [r1, 0xD] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringCopy - ldr r1, =gUnknown_0860B310 - ldr r0, [r4] - ldrb r0, [r0, 0xD] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - adds r0, r5, 0 - bl StringCopy10 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E794 - thumb_func_start sub_818E7E0 sub_818E7E0: @ 818E7E0 push {r4,lr} diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 30b5d6b21..efbc791e8 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -35,6 +35,8 @@ extern const u16 *const gUnknown_0860B1A4[16]; extern const u16 gUnknown_0860B1E4[16]; extern const u16 gUnknown_0860B204[16]; extern const u8 gUnknown_085EEB7E[8]; +extern const u8 *const gUnknown_0860B324[5]; +extern const u8 *const gUnknown_0860B310[5]; EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL; EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL; @@ -814,3 +816,10 @@ bool8 sub_818E704(struct Pokeblock *pokeblock) } return response; } + +void sub_818E794(u8 *dest1, u8 *dest2) +{ + gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; + StringCopy(dest1, gUnknown_0860B324[gUnknown_0203CD6C->category]); + StringCopy10(dest2, gUnknown_0860B310[gUnknown_0203CD6C->category]); +} |