Name remaining pokemon_icon funcs

asm/naming_screen.s

@@ -2849,7 +2849,7 @@ _0809EFEC: .4byte gUnknown_83E252C
 sub_809EFF0: @ 809EFF0
 	push {lr}
 	sub sp, 0xC
-	bl sub_809707C
+	bl LoadMonIconPalettes
 	ldr r0, _0809F038 @ =gUnknown_203998C
 	ldr r3, [r0]
 	ldr r1, _0809F03C @ =0x00001e34

asm/party_menu.s

@@ -373,7 +373,7 @@ _0811ED44:
 	bl sub_8122980
 	b _0811EDFC
 _0811ED4A:
-	bl sub_809707C
+	bl LoadMonIconPalettes
 	b _0811EDFC
 _0811ED50:
 	bl party_menu_add_per_mon_objects
@@ -7206,7 +7206,7 @@ party_menu_link_mon_icon_anim: @ 812224C
 	lsrs r7, r3, 24
 	cmp r5, 0
 	beq _0812229A
-	ldr r1, _081222A4 @ =sub_809718C
+	ldr r1, _081222A4 @ =SpriteCB_MonIcon
 	ldr r0, [r4, 0x4]
 	ldrb r2, [r0]
 	ldrb r3, [r0, 0x1]
@@ -7240,7 +7240,7 @@ _0812229A:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_081222A4: .4byte sub_809718C
+_081222A4: .4byte SpriteCB_MonIcon
 _081222A8: .4byte gSprites
 	thumb_func_end party_menu_link_mon_icon_anim
 
@@ -7276,7 +7276,7 @@ _081222D4:
 	ldr r1, _081222F0 @ =gSprites
 	adds r0, r1
 	movs r1, 0
-	bl sub_8097414
+	bl MonIcon_SetAnim
 	b _0812234C
 	.align 2, 0
 _081222F0: .4byte gSprites
@@ -7287,7 +7287,7 @@ _081222F4:
 	ldr r1, _08122308 @ =gSprites
 	adds r0, r1
 	movs r1, 0x1
-	bl sub_8097414
+	bl MonIcon_SetAnim
 	b _0812234C
 	.align 2, 0
 _08122308: .4byte gSprites
@@ -7298,7 +7298,7 @@ _0812230C:
 	ldr r1, _08122320 @ =gSprites
 	adds r0, r1
 	movs r1, 0x2
-	bl sub_8097414
+	bl MonIcon_SetAnim
 	b _0812234C
 	.align 2, 0
 _08122320: .4byte gSprites
@@ -7309,7 +7309,7 @@ _08122324:
 	ldr r1, _08122338 @ =gSprites
 	adds r0, r1
 	movs r1, 0x3
-	bl sub_8097414
+	bl MonIcon_SetAnim
 	b _0812234C
 	.align 2, 0
 _08122338: .4byte gSprites
@@ -7320,7 +7320,7 @@ _0812233C:
 	ldr r1, _08122354 @ =gSprites
 	adds r0, r1
 	movs r1, 0x4
-	bl sub_8097414
+	bl MonIcon_SetAnim
 _0812234C:
 	pop {r4}
 	pop {r0}

asm/pokemon_storage_system.s

@@ -8688,7 +8688,7 @@ _0808FFA8: .4byte 0x00004037
 	thumb_func_start sub_808FFAC
 sub_808FFAC: @ 808FFAC
 	push {r4-r6,lr}
-	bl sub_809707C
+	bl LoadMonIconPalettes
 	movs r2, 0
 	ldr r3, _0809003C @ =gUnknown_20397B0
 	ldr r5, _08090040 @ =0x00000b04
@@ -19235,7 +19235,7 @@ _0809515A:
 	movs r0, 0
 	bl HideBg
 	movs r0, 0x80
-	bl sub_8097198
+	bl LoadMonIconPalettesAt
 	b _080951F8
 _08095168:
 	adds r0, r1, 0x2

asm/pokemon_summary_screen.s

@@ -10926,7 +10926,7 @@ sub_8139F20: @ 8139F20
 	lsls r0, 2
 	ldr r1, _08139F60 @ =gSprites
 	adds r0, r1
-	bl sub_8097070
+	bl DestroyMonIcon
 	pop {r4}
 	pop {r0}
 	bx r0

asm/trade.s

@@ -83,7 +83,7 @@ _0804C674:
 	movs r1, 0x1
 	movs r2, 0xE0
 	bl TextWindow_SetUserSelectedFrame
-	bl sub_809707C
+	bl LoadMonIconPalettes
 	ldr r2, _0804C708 @ =gUnknown_2031DA8
 	ldr r0, [r2]
 	adds r0, 0x69
@@ -521,7 +521,7 @@ _0804CA4A:
 	str r0, [sp, 0x4]
 	str r1, [sp, 0x8]
 	adds r0, r5, 0
-	ldr r1, _0804CB44 @ =sub_809718C
+	ldr r1, _0804CB44 @ =SpriteCB_MonIcon
 	bl CreateMonIcon
 	mov r2, r8
 	ldr r1, [r2]
@@ -580,7 +580,7 @@ _0804CABE:
 	movs r0, 0
 	str r0, [sp, 0x8]
 	adds r0, r5, 0
-	ldr r1, _0804CB44 @ =sub_809718C
+	ldr r1, _0804CB44 @ =SpriteCB_MonIcon
 	bl CreateMonIcon
 	mov r2, r8
 	ldr r1, [r2]
@@ -607,7 +607,7 @@ _0804CB34: .4byte gEnemyPartyCount
 _0804CB38: .4byte gUnknown_8261E40
 _0804CB3C: .4byte gPlayerParty
 _0804CB40: .4byte 0xfff40000
-_0804CB44: .4byte sub_809718C
+_0804CB44: .4byte SpriteCB_MonIcon
 _0804CB48: .4byte gEnemyParty
 _0804CB4C: .4byte gMain
 _0804CB50:
@@ -1211,7 +1211,7 @@ _0804D048:
 	str r0, [sp, 0x4]
 	str r1, [sp, 0x8]
 	adds r0, r5, 0
-	ldr r1, _0804D144 @ =sub_809718C
+	ldr r1, _0804D144 @ =SpriteCB_MonIcon
 	bl CreateMonIcon
 	mov r2, r8
 	ldr r1, [r2]
@@ -1270,7 +1270,7 @@ _0804D0BE:
 	movs r0, 0
 	str r0, [sp, 0x8]
 	adds r0, r5, 0
-	ldr r1, _0804D144 @ =sub_809718C
+	ldr r1, _0804D144 @ =SpriteCB_MonIcon
 	bl CreateMonIcon
 	mov r2, r8
 	ldr r1, [r2]
@@ -1297,7 +1297,7 @@ _0804D134: .4byte gEnemyPartyCount
 _0804D138: .4byte gUnknown_8261E40
 _0804D13C: .4byte gPlayerParty
 _0804D140: .4byte 0xfff40000
-_0804D144: .4byte sub_809718C
+_0804D144: .4byte SpriteCB_MonIcon
 _0804D148: .4byte gEnemyParty
 _0804D14C: .4byte gMain
 _0804D150:
@@ -4651,7 +4651,7 @@ _0804EBA2:
 	adds r0, r1
 	lsls r0, 2
 	add r0, r8
-	ldr r1, _0804ECAC @ =sub_809718C
+	ldr r1, _0804ECAC @ =SpriteCB_MonIcon
 	bl StoreSpriteCallbackInData6
 	ldr r2, _0804ECA4 @ =gUnknown_2031DA8
 	ldr r1, [r2]
@@ -4698,7 +4698,7 @@ _0804EC98:
 _0804ECA0: .4byte gSprites
 _0804ECA4: .4byte gUnknown_2031DA8
 _0804ECA8: .4byte gUnknown_8261E40
-_0804ECAC: .4byte sub_809718C
+_0804ECAC: .4byte SpriteCB_MonIcon
 _0804ECB0: .4byte gUnknown_8260A32
 _0804ECB4:
 	ldr r2, _0804ECE4 @ =gSprites
@@ -4717,7 +4717,7 @@ _0804ECB4:
 	adds r2, 0x1C
 	adds r0, r2
 	ldr r1, [r0]
-	ldr r0, _0804ECE8 @ =sub_809718C
+	ldr r0, _0804ECE8 @ =SpriteCB_MonIcon
 	cmp r1, r0
 	beq _0804ECDC
 	b _0804EE54
@@ -4727,7 +4727,7 @@ _0804ECDC:
 	b _0804EE54
 	.align 2, 0
 _0804ECE4: .4byte gSprites
-_0804ECE8: .4byte sub_809718C
+_0804ECE8: .4byte SpriteCB_MonIcon
 _0804ECEC:
 	ldr r1, _0804EE08 @ =gUnknown_8260834
 	ldr r0, [sp, 0x60]
@@ -6356,7 +6356,7 @@ _0804F988:
 	subs r1, r2
 	lsls r1, 24
 	lsrs r1, 24
-	bl sub_8097414
+	bl MonIcon_SetAnim
 	adds r4, 0x1
 	ldr r0, [r6]
 	adds r0, 0x36

asm/trainer_card.s

@@ -1215,7 +1215,7 @@ _080899AE:
 	bl VarGet
 	lsls r0, 16
 	lsrs r0, 16
-	bl sub_8096FD4
+	bl MailSpeciesToIconSpecies
 	adds r1, r5, 0
 	adds r1, 0x54
 	strh r0, [r1]
@@ -1223,7 +1223,7 @@ _080899AE:
 	bl VarGet
 	lsls r0, 16
 	lsrs r0, 16
-	bl sub_8096FD4
+	bl MailSpeciesToIconSpecies
 	adds r1, r5, 0
 	adds r1, 0x56
 	strh r0, [r1]
@@ -1231,7 +1231,7 @@ _080899AE:
 	bl VarGet
 	lsls r0, 16
 	lsrs r0, 16
-	bl sub_8096FD4
+	bl MailSpeciesToIconSpecies
 	adds r1, r5, 0
 	adds r1, 0x58
 	strh r0, [r1]
@@ -1239,7 +1239,7 @@ _080899AE:
 	bl VarGet
 	lsls r0, 16
 	lsrs r0, 16
-	bl sub_8096FD4
+	bl MailSpeciesToIconSpecies
 	adds r1, r5, 0
 	adds r1, 0x5A
 	strh r0, [r1]
@@ -1247,7 +1247,7 @@ _080899AE:
 	bl VarGet
 	lsls r0, 16
 	lsrs r0, 16
-	bl sub_8096FD4
+	bl MailSpeciesToIconSpecies
 	adds r1, r5, 0
 	adds r1, 0x5C
 	strh r0, [r1]
@@ -1255,7 +1255,7 @@ _080899AE:
 	bl VarGet
 	lsls r0, 16
 	lsrs r0, 16
-	bl sub_8096FD4
+	bl MailSpeciesToIconSpecies
 	adds r1, r5, 0
 	adds r1, 0x5E
 	strh r0, [r1]

include/pokemon_icon.h

@@ -11,11 +11,11 @@ void sub_80D2F68(u16 iconId);
 u8 sub_80D2D78(u16 iconId, void callback(struct Sprite *), u16 x, u16 y, u16 a4, u8 a5);
 void sub_80D2FF0(u16 iconId);
 void sub_80D2EF8(struct Sprite *sprite);
-void sub_809707C(void);
+void LoadMonIconPalettes(void);
 void FreeMonIconPalettes(void);
-u16 sub_8096FD4(u16);
+u16 MailSpeciesToIconSpecies(u16);
-u8 sub_8096ECC(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, bool32 extra);
+u8 CreateMonIcon_HandleDeoxys(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, bool32 extra);
-void sub_8097070(struct Sprite *);
+void DestroyMonIcon(struct Sprite *);
 u16 GetUnownLetterByPersonality(u32 personality);
 u8 UpdateMonIconFrame(struct Sprite *sprite);
 void LoadMonIconPalette(u16 iconId);

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));
+            FreeMonIconPalette(MailSpeciesToIconSpecies(sMailViewResources->mail->species));
-            sub_8097070(&gSprites[sMailViewResources->monIconSpriteId]);
+            DestroyMonIcon(&gSprites[sMailViewResources->monIconSpriteId]);
             break;
         }
         *sMailViewResources = (struct MailViewResources){};

src/mevent_8145654.c

@@ -200,7 +200,7 @@ s32 FadeToWonderCardMenu(void)
             CopyBgTilemapBufferToVram(1);
             break;
         case 6:
-            sub_809707C();
+            LoadMonIconPalettes();
             break;
         case 7:
             ShowBg(1);
@@ -398,7 +398,7 @@ void sub_8146060(void)
     gUnknown_203F3C8->unk_017C = 0xFF;
     if (gUnknown_203F3C8->unk_014C.unk_06 != SPECIES_NONE)
     {
-        gUnknown_203F3C8->unk_017C = sub_8096ECC(sub_8096FD4(gUnknown_203F3C8->unk_014C.unk_06), SpriteCallbackDummy, 0xDC, 0x14, 0, FALSE);
+        gUnknown_203F3C8->unk_017C = CreateMonIcon_HandleDeoxys(MailSpeciesToIconSpecies(gUnknown_203F3C8->unk_014C.unk_06), SpriteCallbackDummy, 0xDC, 0x14, 0, FALSE);
         gSprites[gUnknown_203F3C8->unk_017C].oam.priority = 2;
     }
     if (gUnknown_203F3C8->unk_0000.unk_09 != 0 && gUnknown_203F3C8->unk_0000.unk_08_0 == 1)
@@ -412,7 +412,7 @@ void sub_8146060(void)
             gUnknown_203F3C8->unk_017D[r7][0] = CreateSprite(&gUnknown_8467FA0, 0xd8 - 32 * r7, 0x90, 8);
             if (gUnknown_203F3C8->unk_014C.unk_08[0][r7] != 0)
             {
-                gUnknown_203F3C8->unk_017D[r7][1] = sub_8096ECC(sub_8096FD4(gUnknown_203F3C8->unk_014C.unk_08[0][r7]), SpriteCallbackDummy, 0xd8 - 32 * r7, 0x88, 0, 0);
+                gUnknown_203F3C8->unk_017D[r7][1] = CreateMonIcon_HandleDeoxys(MailSpeciesToIconSpecies(gUnknown_203F3C8->unk_014C.unk_08[0][r7]), SpriteCallbackDummy, 0xd8 - 32 * r7, 0x88, 0, 0);
                 gSprites[gUnknown_203F3C8->unk_017D[r7][1]].oam.priority = 2;
             }
         }
@@ -423,7 +423,7 @@ void sub_81461D8(void)
 {
     u8 r6 = 0;
     if (gUnknown_203F3C8->unk_017C != 0xFF)
-        sub_8097070(&gSprites[gUnknown_203F3C8->unk_017C]);
+        DestroyMonIcon(&gSprites[gUnknown_203F3C8->unk_017C]);
     if (gUnknown_203F3C8->unk_0000.unk_09 != 0 && gUnknown_203F3C8->unk_0000.unk_08_0 == 1)
     {
         for (; r6 < gUnknown_203F3C8->unk_0000.unk_09; r6++)
@@ -435,7 +435,7 @@ void sub_81461D8(void)
                 // if (gUnknown_203F3C8->unk_017D[r6][1] != 0xFF)
                 if (gUnknown_203F3C8->unk_017D[r6][0] != 0xFF)
                 {
-                    sub_8097070(&gSprites[gUnknown_203F3C8->unk_017D[r6][1]]);
+                    DestroyMonIcon(&gSprites[gUnknown_203F3C8->unk_017D[r6][1]]);
                 }
             }
         }

src/pokemon_icon.c

@@ -18,7 +18,7 @@ struct MonIconSpriteTemplate
 };
 
 static u8 CreateMonIconSprite(const struct MonIconSpriteTemplate * template, s16 x, s16 y, u8 subpriority);
-void sub_80973D8(struct Sprite * sprite);
+static void DestroyMonIconInternal(struct Sprite * sprite);
 
 const u16 gMonIconPalettes[][16] = INCBIN_U16("graphics/pokemon/icon_palettes/icon_palette_0.gbapal", "graphics/pokemon/icon_palettes/icon_palette_1.gbapal", "graphics/pokemon/icon_palettes/icon_palette_2.gbapal");
 
@@ -1029,7 +1029,7 @@ u8 CreateMonIcon(u16 species, SpriteCallback callback, s16 x, s16 y, u8 subprior
     return spriteId;
 }
 
-u8 sub_8096ECC(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, bool32 extra)
+u8 CreateMonIcon_HandleDeoxys(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, bool32 extra)
 {
     u8 spriteId;
     struct MonIconSpriteTemplate iconTemplate =
@@ -1082,7 +1082,7 @@ u16 GetUnownLetterByPersonality(u32 personality)
         return (((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | (personality & 0x3)) % 0x1C;
 }
 
-u16 sub_8096FD4(u16 species)
+u16 MailSpeciesToIconSpecies(u16 species)
 {
     u16 value;
 
@@ -1115,12 +1115,12 @@ const u8 *GetMonIconPtr(u16 species, u32 personality, bool32 extra)
     return GetMonIconTiles(GetIconSpecies(species, personality), extra);
 }
 
-void sub_8097070(struct Sprite * sprite)
+void DestroyMonIcon(struct Sprite * sprite)
 {
-    sub_80973D8(sprite);
+    DestroyMonIconInternal(sprite);
 }
 
-void sub_809707C(void)
+void LoadMonIconPalettes(void)
 {
     u8 i;
     for (i = 0; i < NELEMS(gMonIconPaletteTable); i++)
@@ -1167,12 +1167,12 @@ void FreeMonIconPalette(u16 species)
     FreeSpritePaletteByTag(gMonIconPaletteTable[palIndex].tag);
 }
 
-void sub_809718C(struct Sprite * sprite)
+void SpriteCB_MonIcon(struct Sprite * sprite)
 {
     UpdateMonIconFrame(sprite);
 }
 
-void sub_8097198(u16 offset)
+void LoadMonIconPalettesAt(u16 offset)
 {
     int i;
     if (offset <= 0x100 - 0x60)
@@ -1263,14 +1263,14 @@ static u8 CreateMonIconSprite(const struct MonIconSpriteTemplate *iconTemplate,
     return spriteId;
 }
 
-void sub_80973D8(struct Sprite *sprite)
+static void DestroyMonIconInternal(struct Sprite *sprite)
 {
     struct SpriteFrameImage image = { NULL, sSpriteImageSizes[sprite->oam.shape][sprite->oam.size] };
     sprite->images = &image;
     DestroySprite(sprite);
 }
 
-void sub_8097414(struct Sprite *sprite, u8 animNum)
+void MonIcon_SetAnim(struct Sprite *sprite, u8 animNum)
 {
     sprite->animNum = animNum;
     sprite->animDelayCounter = 0;