option menu fix conflicts

This commit is contained in:
DizzyEggg
2018-01-21 12:46:19 +01:00
734 changed files with 44889 additions and 16751 deletions

View File

@@ -240,30 +240,6 @@ static const struct MailLayout sUnknown_0859F458[] = {
{ 0x05, 0x09, 0x60, 0x05, 0x1e, Unknown_0859F444 }
};
// What the heck are these meant to be? Call them u16 for now.
static const u16 Unknown_0859F4E8[] = {
0x00, 0x4000, 0x00, 0x00
};
static const u16 Unknown_0859F4F0[] = {
0x00, 0x00, -1, 0x00
};
static const u16 Unknown_0859F4F8[] = {
0x04, 0x00, -1, 0x00
};
static const u16 Unknown_0859F500[] = {
0x00, 0x40, -1, 0x00
};
static const u16 *const sUnknown_0859F508[] = {
Unknown_0859F4F0,
Unknown_0859F4F8,
Unknown_0859F500
};
// .text
void ReadMail(struct MailStruct *mail, void (*callback)(void), bool8 flag)