Merge conflict resolves into review changes

1 files changed, 2 insertions, 2 deletions

diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index ee68de326..7d7dadccb 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -1184,7 +1184,7 @@ void FreeMonIconPalette(u16 species)
     FreeSpritePaletteByTag(gMonIconPaletteTable[palIndex].tag);
 }
 
-void sub_80D3014(struct Sprite *sprite)
+void UpdateTradeMonIconFrame(struct Sprite *sprite)
 {
     UpdateMonIconFrame(sprite);
 }
@@ -1302,7 +1302,7 @@ void sub_80D328C(struct Sprite *sprite)
     DestroySprite(sprite);
 }
 
-void sub_80D32C8(struct Sprite *sprite, u8 animNum)
+void SetPartyHPBarSprite(struct Sprite *sprite, u8 animNum)
 {
     sprite->animNum = animNum;
     sprite->animDelayCounter = 0;