option menu fix conflicts
This commit is contained in:
24
src/mail.c
24
src/mail.c
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user