diff options
| author | Devin <easyaspi314@users.noreply.github.com> | 2018-01-21 15:22:05 -0500 |
|---|---|---|
| committer | Devin <easyaspi314@users.noreply.github.com> | 2018-01-21 15:22:05 -0500 |
| commit | 35cc20c9aa5a37f03bc0bf46bc31398aecda7bf6 (patch) | |
| tree | 59427fda7dbbb92268caf353870d0f0ed8f5e13b /src/mail.c | |
| parent | c408110319885748b4fcc696063242c7002f4d30 (diff) | |
| parent | a1aa645f2364deffda698b8e0cdc5c961b5306a5 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms
Diffstat (limited to 'src/mail.c')
| -rw-r--r-- | src/mail.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/mail.c b/src/mail.c index 68a55e242..c3cbe4a3c 100644 --- a/src/mail.c +++ b/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) @@ -329,7 +305,7 @@ static bool8 MailReadBuildGraphics(void) { case 0: SetVBlankCallback(NULL); - remove_some_task(); + ScanlineEffect_Stop(); SetGpuReg(REG_OFFSET_DISPCNT, 0x0000); break; case 1: |