ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

through sub_818E308

Browse Source
This commit is contained in:
scnorton 2017-09-20 11:44:20 -04:00
parent 8a31e58689
commit 213fef6042
3 changed files with 22 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
asm/lilycove_lady.s
View File

@ -5,62 +5,6 @@
.text
thumb_func_start sub_818E2D8
sub_818E2D8: @ 818E2D8
ldr r2, =gUnknown_0203CD68
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r3, =0x00003b58
adds r1, r0, r3
str r1, [r2]
ldr r1, =0x00003b82
adds r0, r1
ldrb r0, [r0]
bx lr
.pool
thumb_func_end sub_818E2D8
thumb_func_start sub_818E2FC
sub_818E2FC: @ 818E2FC
push {lr}
bl easy_chat_input_maybe
pop {r0}
bx r0
thumb_func_end sub_818E2FC
thumb_func_start sub_818E308
sub_818E308: @ 818E308
push {r4-r6,lr}
ldr r5, =gUnknown_0203CD68
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x00003b58
adds r0, r1
str r0, [r5]
ldr r6, =gStringVar1
ldrh r1, [r0, 0x14]
adds r0, r6, 0
bl CopyEasyChatWord
ldr r4, =gStringVar2
ldr r0, [r5]
ldrh r1, [r0, 0x16]
adds r0, r4, 0
bl CopyEasyChatWord
adds r0, r6, 0
adds r1, r4, 0
bl StringCompare
movs r1, 0
cmp r0, 0
bne _0818E33C
movs r1, 0x1
_0818E33C:
adds r0, r1, 0
pop {r4-r6}
pop {r1}
bx r1
.pool
thumb_func_end sub_818E308
thumb_func_start sub_818E358
sub_818E358: @ 818E358
ldr r1, =gUnknown_0203CD68

2
include/easy_chat.h
View File

@ -29,5 +29,7 @@ enum
};
void InitEasyChatPhrases(void);
void easy_chat_input_maybe(void);
void CopyEasyChatWord(u8 *, u16);
#endif // GUARD_EASYCHAT_H

20
src/lilycove_lady.c
View File

@ -12,6 +12,7 @@
#include "items.h"
#include "item_menu.h"
#include "text.h"
#include "easy_chat.h"
#include "lilycove_lady.h"
void SetLilycoveQuizLady(void);
@ -573,3 +574,22 @@ bool8 sub_818E298(void)
}
return FALSE;
}
u8 sub_818E2D8(void)
{
gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
return gUnknown_0203CD68->unk_02a;
}
void sub_818E2FC(void)
{
easy_chat_input_maybe();
}
bool8 sub_818E308(void)
{
gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
CopyEasyChatWord(gStringVar1, gUnknown_0203CD68->unk_014);
CopyEasyChatWord(gStringVar2, gUnknown_0203CD68->unk_016);
return StringCompare(gStringVar1, gStringVar2) ? FALSE : TRUE;
}