summaryrefslogtreecommitdiff
path: root/src/mail.c
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-04-25 00:28:57 -0400
committergolem galvanize <golemgalvanize@github.com>2018-04-25 00:28:57 -0400
commit6a401b53867de87165f625510624c4a296dba34b (patch)
tree1a03aba54ebed695fffe2c11a1eb26f2b975f960 /src/mail.c
parent069a7e71fc8bd0886fe2d5c39bb96d8fee0d798b (diff)
parent867b496f2e5a525043c9fd82ccaaad9349c89fac (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex
Diffstat (limited to 'src/mail.c')
-rw-r--r--src/mail.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mail.c b/src/mail.c
index ac263ac67..85ba86974 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -403,11 +403,11 @@ static bool8 MailReadBuildGraphics(void)
switch (sMailRead->animsActive)
{
case 1:
- sub_80D2F68(icon);
+ LoadMonIconPalette(icon);
sMailRead->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x60, 0x80, 0, 0);
break;
case 2:
- sub_80D2F68(icon);
+ LoadMonIconPalette(icon);
sMailRead->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x28, 0x80, 0, 0);
break;
}
@@ -540,7 +540,7 @@ static void CB2_ExitMailReadFreeVars(void)
{
case 1:
case 2:
- sub_80D2FF0(sub_80D2E84(sMailRead->mail->species));
+ FreeMonIconPalette(sub_80D2E84(sMailRead->mail->species));
sub_80D2EF8(&gSprites[sMailRead->monIconSprite]);
}
memset(sMailRead, 0, sizeof(*sMailRead));