diff options
| author | GriffinR <25753467+GriffinRichards@users.noreply.github.com> | 2019-08-05 20:37:09 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-08-21 17:06:55 -0500 |
| commit | d931ba96020397ec9a9740a9d67aac8a99bf11f6 (patch) | |
| tree | ec3548ef8c9d10eb7a75f13348a5f9f7bd0adad7 /include/global.h | |
| parent | 7fc99f39525a89aa0f3158b98bc61e709bebdfa2 (diff) | |
document remaining funcs
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/include/global.h b/include/global.h index a055cb2c0..df0d0c1ea 100644 --- a/include/global.h +++ b/include/global.h @@ -737,24 +737,16 @@ struct RecordMixingDayCareMail bool16 holdsItem[DAYCARE_MON_COUNT]; }; -enum -{ - LILYCOVE_LADY_QUIZ, - LILYCOVE_LADY_FAVOR, - LILYCOVE_LADY_CONTEST, - LILYCOVE_LADY_COUNT -}; - struct LilycoveLadyQuiz { /*0x000*/ u8 id; /*0x001*/ u8 state; /*0x002*/ u16 question[9]; - /*0x014*/ u16 answer; - /*0x016*/ u16 response; + /*0x014*/ u16 correctAnswer; + /*0x016*/ u16 playerAnswer; /*0x018*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x020*/ u16 playerTrainerId[4]; - /*0x028*/ u16 itemId; + /*0x028*/ u16 prize; /*0x02a*/ bool8 waitingForChallenger; /*0x02b*/ u8 questionId; /*0x02c*/ u8 prevQuestionId; @@ -778,10 +770,10 @@ struct LilycoveLadyContest { /*0x000*/ u8 id; /*0x001*/ bool8 givenPokeblock; - /*0x002*/ u8 fave_pkblk; - /*0x003*/ u8 other_pkblk; + /*0x002*/ u8 numGoodPokeblocksGiven; + /*0x003*/ u8 numOtherPokeblocksGiven; /*0x004*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; - /*0x00c*/ u8 max_sheen; + /*0x00c*/ u8 maxSheen; /*0x00d*/ u8 category; /*0x00e*/ u8 language; }; |