diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-08-12 12:17:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-12 12:17:23 -0700 |
| commit | 32b0e102cf7ac8f6ec7f0e49324532c800d6b038 (patch) | |
| tree | a8772aef963bab43e6c8af4984ab26ecd408a03f /include | |
| parent | 6bb761a7115a09a846bec7f97c51e02ebd6dcaa6 (diff) | |
| parent | 3a72e6a80d52215533936f92efbe8e4f3454b7e6 (diff) | |
Merge pull request #287 from DizzyEggg/easy_chat
Pikalax's Easy chat
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 2 | ||||
| -rw-r--r-- | include/global.tv.h | 4 | ||||
| -rw-r--r-- | include/link.h | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/global.h b/include/global.h index 2015d47cc..1a179d858 100644 --- a/include/global.h +++ b/include/global.h @@ -761,7 +761,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 |