diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-11 14:14:51 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-11 14:14:51 +0200 |
| commit | 59d8d568683283f782ee7f77b65107e59dc1389d (patch) | |
| tree | 4cf35c87e6417f500aaf7a47622c4ac696de6411 /include | |
| parent | 85ebd76cd03e1ee84f182585060b3a79b8653e85 (diff) | |
| parent | 6b84feaaf2ba492bef23a42c28603bbaa3ccd2e6 (diff) | |
merge easy chat with master
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 6 | ||||
| -rw-r--r-- | include/global.tv.h | 4 | ||||
| -rw-r--r-- | include/link.h | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/global.h b/include/global.h index 7153ef260..a0722bcc9 100644 --- a/include/global.h +++ b/include/global.h @@ -719,8 +719,8 @@ struct LilycoveLadyQuiz /*0x000*/ u8 id; /*0x001*/ u8 phase; /*0x002*/ u16 unk_002[9]; - /*0x014*/ u16 unk_014; - /*0x016*/ u16 unk_016; + /*0x014*/ u16 unk_014[1]; + /*0x016*/ u16 unk_016[1]; /*0x018*/ u8 playerName[8]; /*0x020*/ u16 playerTrainerId[4]; /*0x028*/ u16 itemId; @@ -755,7 +755,7 @@ struct LilycoveLadyContest /*0x00e*/ u8 language; }; -typedef union +typedef union // 3b58 { struct LilycoveLadyQuiz quiz; struct LilycoveLadyFavour favour; diff --git a/include/global.tv.h b/include/global.tv.h index 805922d5c..61f014984 100644 --- a/include/global.tv.h +++ b/include/global.tv.h @@ -91,7 +91,7 @@ typedef union // size = 0x24 /*0x0E*/ u8 pokemonNameLanguage; /*0x0F*/ u8 filler_0F[1]; /*0x10*/ u8 nickname[8]; - /*0x18*/ u8 filler_18[4]; + /*0x18*/ u16 words18[2]; /*0x1C*/ u16 words[4]; } fanclubOpinions; @@ -99,7 +99,7 @@ typedef union // size = 0x24 struct { /*0x00*/ u8 kind; /*0x01*/ bool8 active; - /*0x02*/ u8 pad02[4]; + /*0x02*/ u16 words[2]; /*0x06*/ u16 var06; /*0x08*/ u8 pad_08[3]; /*0x0b*/ u8 string_0b[12]; diff --git a/include/link.h b/include/link.h index b1b5a6d04..9561728bd 100644 --- a/include/link.h +++ b/include/link.h @@ -301,5 +301,6 @@ void sub_8009FAC(void); bool8 sub_800A4D8(u8 a0); u8 sub_800A9D8(void); u8 sub_800A0C8(s32, s32); +u16 *sub_801B058(void); #endif // GUARD_LINK_H |