diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 22:57:22 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 22:57:22 -0400 |
| commit | 9b00767b55b70627aad81b67b87c06db9dca5742 (patch) | |
| tree | 465b0963171860ae2da8071729cd7377060c0198 | |
| parent | 28d0fa33fef825dcb22d45db966ef814c461dd08 (diff) | |
sub_818E004; sanity
| -rw-r--r-- | asm/lilycove_lady.s | 22 | ||||
| -rw-r--r-- | src/lilycove_lady.c | 13 |
2 files changed, 11 insertions, 24 deletions
diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index c3e72fab1..bf3313a97 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,28 +5,6 @@ .text - thumb_func_start sub_818E004 -sub_818E004: @ 818E004 - ldr r2, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003b58 - adds r0, r1 - str r0, [r2] - movs r1, 0 - strb r1, [r0] - ldr r0, [r2] - strb r1, [r0, 0x1] - ldr r0, [r2] - adds r0, 0x2A - strb r1, [r0] - ldr r1, [r2] - ldr r0, =0x0000ffff - strh r0, [r1, 0x16] - bx lr - .pool - thumb_func_end sub_818E004 - thumb_func_start sub_818E038 sub_818E038: @ 818E038 push {lr} diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 901812ed6..c7a5ef68d 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -189,7 +189,7 @@ bool8 sub_818DC60(void) gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; if (gUnknown_0203CD64->unk_004[0] != EOS) { - StringCopy7(gStringVar3, gSaveBlock1Ptr->lilycoveLady.favour.unk_004); + StringCopy7(gStringVar3, gUnknown_0203CD64->unk_004); ConvertInternationalString(gStringVar3, gUnknown_0203CD64->language); return TRUE; } @@ -216,7 +216,7 @@ void sub_818DCF4(const u8 *src, u8 *dest) void sub_818DD14(void) { gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; - sub_818DCF4(gSaveBlock1Ptr->lilycoveLady.favour.unk_004, gStringVar3); + sub_818DCF4(gUnknown_0203CD64->unk_004, gStringVar3); ConvertInternationalString(gStringVar3, gUnknown_0203CD64->language); } @@ -343,3 +343,12 @@ void SetLilycoveQuizLady(void) gUnknown_0203CD68->language = gGameLanguage; sub_818DF00(); } + +void sub_818E004(void) +{ + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + gUnknown_0203CD68->id = LILYCOVE_LADY_QUIZ; + gUnknown_0203CD68->unk_001 = 0; + gUnknown_0203CD68->unk_02a = 0; + gUnknown_0203CD68->unk_016 = -1; +} |