merge easy chat with master
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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];
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user