diff options
| author | GriffinR <25753467+GriffinRichards@users.noreply.github.com> | 2019-08-04 04:22:19 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-08-21 17:06:55 -0500 |
| commit | 23979c4d7d6f7b10107f94781add4c9d3b0c7e52 (patch) | |
| tree | a2cb38fab2ebd88cc9a9964c32d96dff259991be /include | |
| parent | d68497f823b44381f7302b40faf34f639da3bab1 (diff) | |
initial documentation commit
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 16 | ||||
| -rw-r--r-- | include/lilycove_lady.h | 2 | ||||
| -rw-r--r-- | include/strings.h | 25 |
3 files changed, 34 insertions, 9 deletions
diff --git a/include/global.h b/include/global.h index 14377d8bb..db80d81a0 100644 --- a/include/global.h +++ b/include/global.h @@ -748,26 +748,26 @@ struct LilycoveLadyQuiz { /*0x000*/ u8 id; /*0x001*/ u8 phase; - /*0x002*/ u16 unk_002[9]; - /*0x014*/ u16 unk_014; - /*0x016*/ u16 unk_016; + /*0x002*/ u16 question[9]; + /*0x014*/ u16 answer; + /*0x016*/ u16 response; /*0x018*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x020*/ u16 playerTrainerId[4]; /*0x028*/ u16 itemId; - /*0x02a*/ u8 unk_02a; - /*0x02b*/ u8 unk_02b; - /*0x02c*/ u8 unk_02c; + /*0x02a*/ bool8 waitingForChallenger; + /*0x02b*/ u8 questionId; + /*0x02c*/ u8 prevQuestionId; /*0x02d*/ u8 language; }; -struct LilycoveLadyFavour +struct LilycoveLadyFavor { /*0x000*/ u8 id; /*0x001*/ u8 phase; /*0x002*/ u8 unk_002; /*0x003*/ u8 unk_003; /*0x004*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; - /*0x00c*/ u8 unk_00c; + /*0x00c*/ u8 favorId; /*0x00e*/ u16 itemId; /*0x010*/ u16 unk_010; /*0x012*/ u8 language; diff --git a/include/lilycove_lady.h b/include/lilycove_lady.h index f26285d68..09a1b0c18 100644 --- a/include/lilycove_lady.h +++ b/include/lilycove_lady.h @@ -11,7 +11,7 @@ bool8 GivePokeblockToContestLady(struct Pokeblock *pokeblock); void sub_818E7E0(u8 *dest1, u8 *dest2); void sub_818E81C(u8 *dest); void sub_818E848(u8 *dest); -void sub_818E868(u8 *dest, u8 category); +void BufferContestName(u8 *dest, u8 category); u8 sub_818E880(void); #endif //GUARD_LILYCOVE_LADY_H diff --git a/include/strings.h b/include/strings.h index 7e7fcd322..d6a239559 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2744,6 +2744,31 @@ extern const u8 gText_JumpsInARow[]; extern const u8 gText_BestScore2[]; extern const u8 gText_ExcellentsInARow[]; +// Lilycove Lady +extern const u8 gText_Handsome[]; +extern const u8 gText_Vinny[]; +extern const u8 gText_Moreme[]; +extern const u8 gText_Ironhard[]; +extern const u8 gText_Muscle[]; +extern const u8 gText_Coolness[]; +extern const u8 gText_Beauty[]; +extern const u8 gText_Cuteness[]; +extern const u8 gText_Smartness[]; +extern const u8 gText_Toughness[]; +extern const u8 gText_Lady2[]; +extern const u8 gText_Slippery[]; +extern const u8 gText_Roundish[]; +extern const u8 gText_Whamish[]; +extern const u8 gText_Shiny[]; +extern const u8 gText_Sticky[]; +extern const u8 gText_Pointy[]; + +extern const u8 gText_CoolnessContest[]; +extern const u8 gText_BeautyContest[]; +extern const u8 gText_CutenessContest[]; +extern const u8 gText_SmartnessContest[]; +extern const u8 gText_ToughnessContest[]; + // Pokenav Match Call extern const u8 gText_CallCantBeMadeHere[]; extern const u8 gText_NumberRegistered[]; |