From 170e4d03ff1889647c4d84a621e5c0ae0754e633 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 15 Oct 2019 12:07:14 -0400 Subject: Decompile pokemon_icon --- src/mail.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mail.c') diff --git a/src/mail.c b/src/mail.c index f6b7e2c4d..54dec0031 100644 --- a/src/mail.c +++ b/src/mail.c @@ -600,11 +600,11 @@ static bool8 DoInitMailView(void) switch (sMailViewResources->monIconType) { case MAIL_ICON_BEAD: - sub_80970E0(iconId); + LoadMonIconPalette(iconId); sMailViewResources->monIconSpriteId = sub_8096ECC(iconId, SpriteCallbackDummy, 0x60, 0x80, 0, FALSE); break; case MAIL_ICON_DREAM: - sub_80970E0(iconId); + LoadMonIconPalette(iconId); sMailViewResources->monIconSpriteId = sub_8096ECC(iconId, SpriteCallbackDummy, 0x28, 0x80, 0, FALSE); break; } @@ -726,7 +726,7 @@ static void ShowMailCB_Teardown(void) { case MAIL_ICON_BEAD: case MAIL_ICON_DREAM: - sub_8097168(sub_8096FD4(sMailViewResources->mail->species)); + FreeMonIconPalette(sub_8096FD4(sMailViewResources->mail->species)); sub_8097070(&gSprites[sMailViewResources->monIconSpriteId]); break; } -- cgit v1.2.3 From b08879b07e3712c531f0ca7e8aedead28ff48f78 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 15 Oct 2019 17:04:32 -0400 Subject: Name remaining pokemon_icon funcs --- src/mail.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mail.c') diff --git a/src/mail.c b/src/mail.c index 54dec0031..a9cb66683 100644 --- a/src/mail.c +++ b/src/mail.c @@ -596,16 +596,16 @@ static bool8 DoInitMailView(void) gPaletteFade.bufferTransferDisabled = TRUE; break; case 17: - iconId = sub_8096FD4(sMailViewResources->mail->species); + iconId = MailSpeciesToIconSpecies(sMailViewResources->mail->species); switch (sMailViewResources->monIconType) { case MAIL_ICON_BEAD: LoadMonIconPalette(iconId); - sMailViewResources->monIconSpriteId = sub_8096ECC(iconId, SpriteCallbackDummy, 0x60, 0x80, 0, FALSE); + sMailViewResources->monIconSpriteId = CreateMonIcon_HandleDeoxys(iconId, SpriteCallbackDummy, 0x60, 0x80, 0, FALSE); break; case MAIL_ICON_DREAM: LoadMonIconPalette(iconId); - sMailViewResources->monIconSpriteId = sub_8096ECC(iconId, SpriteCallbackDummy, 0x28, 0x80, 0, FALSE); + sMailViewResources->monIconSpriteId = CreateMonIcon_HandleDeoxys(iconId, SpriteCallbackDummy, 0x28, 0x80, 0, FALSE); break; } break; @@ -726,8 +726,8 @@ static void ShowMailCB_Teardown(void) { case MAIL_ICON_BEAD: case MAIL_ICON_DREAM: - FreeMonIconPalette(sub_8096FD4(sMailViewResources->mail->species)); - sub_8097070(&gSprites[sMailViewResources->monIconSpriteId]); + FreeMonIconPalette(MailSpeciesToIconSpecies(sMailViewResources->mail->species)); + DestroyMonIcon(&gSprites[sMailViewResources->monIconSpriteId]); break; } *sMailViewResources = (struct MailViewResources){}; -- cgit v1.2.3