ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 01:14:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

sub_818E794

Browse Source
This commit is contained in:
PikalaxALT 2017-09-20 20:24:22 -04:00
parent 45d53d9242
commit c56b6fc9a4
2 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
asm/lilycove_lady.s
View File

@ -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}

9
src/lilycove_lady.c
View File

@ -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]);
}