diff options
| author | GriffinR <25753467+GriffinRichards@users.noreply.github.com> | 2019-08-04 23:12:49 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-08-21 17:06:55 -0500 |
| commit | 7fc99f39525a89aa0f3158b98bc61e709bebdfa2 (patch) | |
| tree | ea547e85075467f7b644d9e312d35144d320e009 /include | |
| parent | 771a7b25faf62748ef82534a6838dbf32377ebef (diff) | |
favor lady funcs
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 13 | ||||
| -rw-r--r-- | include/lilycove_lady.h | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/include/global.h b/include/global.h index a25100bd9..a055cb2c0 100644 --- a/include/global.h +++ b/include/global.h @@ -741,13 +741,14 @@ enum { LILYCOVE_LADY_QUIZ, LILYCOVE_LADY_FAVOR, - LILYCOVE_LADY_CONTEST + LILYCOVE_LADY_CONTEST, + LILYCOVE_LADY_COUNT }; struct LilycoveLadyQuiz { /*0x000*/ u8 id; - /*0x001*/ u8 phase; + /*0x001*/ u8 state; /*0x002*/ u16 question[9]; /*0x014*/ u16 answer; /*0x016*/ u16 response; @@ -763,13 +764,13 @@ struct LilycoveLadyQuiz struct LilycoveLadyFavor { /*0x000*/ u8 id; - /*0x001*/ u8 phase; - /*0x002*/ u8 unk_002; - /*0x003*/ u8 unk_003; + /*0x001*/ u8 state; + /*0x002*/ bool8 likedItem; + /*0x003*/ u8 numItemsGiven; /*0x004*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x00c*/ u8 favorId; /*0x00e*/ u16 itemId; - /*0x010*/ u16 unk_010; + /*0x010*/ u16 bestItem; /*0x012*/ u8 language; }; diff --git a/include/lilycove_lady.h b/include/lilycove_lady.h index dde78b8d8..959878ac9 100644 --- a/include/lilycove_lady.h +++ b/include/lilycove_lady.h @@ -2,8 +2,8 @@ #define GUARD_LILYCOVE_LADY_H u8 GetLilycoveLadyId(void); -void SetLilycoveLady(void); -void sub_818DA78(void); +void InitLilycoveLady(void); +void ReadyLilycoveLady(void); void sub_818DEF4(void); void sub_818E564(void); void sub_818E570(const LilycoveLady *lilycoveLady); |