Merge pull request #123 from PikalaxALT/pokemon_icon

Pokemon icon

16 files changed, 2190 insertions, 1356 deletions

diff --git a/asm/naming_screen.s b/asm/naming_screen.s
index 09f4ca070..817d215a0 100644
--- a/asm/naming_screen.s
+++ b/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
@@ -2866,7 +2866,7 @@ sub_809EFF0: @ 809EFF0
 	str r2, [sp, 0x8]
 	movs r2, 0x38
 	movs r3, 0x28
-	bl sub_8096E18
+	bl CreateMonIcon
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, _0809F048 @ =gSprites
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 5ebea0f54..ab17008ec 100644
--- a/asm/party_menu.s
+++ b/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]
@@ -7216,7 +7216,7 @@ party_menu_link_mon_icon_anim: @ 812224C
 	ldr r0, [sp, 0x20]
 	str r0, [sp, 0x8]
 	adds r0, r5, 0
-	bl sub_8096E18
+	bl CreateMonIcon
 	strb r0, [r4, 0x9]
 	ldr r2, _081222A8 @ =gSprites
 	ldrb r0, [r4, 0x9]
@@ -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}
diff --git a/asm/pokemon_icon.s b/asm/pokemon_icon.s
deleted file mode 100644
index 4eb654a50..000000000
--- a/asm/pokemon_icon.s
+++ /dev/null
@@ -1,848 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8096E18
-sub_8096E18: @ 8096E18
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x30
-	adds r4, r0, 0
-	adds r6, r1, 0
-	ldr r0, [sp, 0x4C]
-	ldr r1, [sp, 0x50]
-	ldr r5, [sp, 0x54]
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r2, 16
-	lsrs r2, 16
-	mov r8, r2
-	lsls r3, 16
-	lsrs r7, r3, 16
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	ldr r0, _08096EB4 @ =gUnknown_83D4068
-	str r0, [sp, 0x18]
-	adds r0, r4, 0
-	adds r2, r5, 0
-	bl GetMonIconPtr
-	str r0, [sp, 0x1C]
-	ldr r0, _08096EB8 @ =gUnknown_83D40AC
-	str r0, [sp, 0x20]
-	ldr r0, _08096EBC @ =gUnknown_83D40E0
-	str r0, [sp, 0x24]
-	str r6, [sp, 0x28]
-	ldr r0, _08096EC0 @ =gUnknown_83D3E80
-	adds r0, r4, r0
-	ldr r1, _08096EC4 @ =0x0000dac0
-	adds r5, r1, 0
-	ldrb r0, [r0]
-	adds r1, r5, r0
-	add r0, sp, 0x2C
-	strh r1, [r0]
-	add r1, sp, 0x18
-	mov r0, sp
-	movs r2, 0x18
-	bl memcpy
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r4, r0
-	bls _08096E7E
-	mov r0, sp
-	strh r5, [r0, 0x14]
-_08096E7E:
-	mov r0, r8
-	lsls r1, r0, 16
-	asrs r1, 16
-	lsls r2, r7, 16
-	asrs r2, 16
-	mov r0, sp
-	mov r3, r9
-	bl CreateMonIconSprite
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r0, r4, 4
-	adds r0, r4
-	lsls r0, 2
-	ldr r1, _08096EC8 @ =gSprites
-	adds r0, r1
-	bl UpdateMonIconFrame
-	adds r0, r4, 0
-	add sp, 0x30
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08096EB4: .4byte gUnknown_83D4068
-_08096EB8: .4byte gUnknown_83D40AC
-_08096EBC: .4byte gUnknown_83D40E0
-_08096EC0: .4byte gUnknown_83D3E80
-_08096EC4: .4byte 0x0000dac0
-_08096EC8: .4byte gSprites
-	thumb_func_end sub_8096E18
-
-	thumb_func_start sub_8096ECC
-sub_8096ECC: @ 8096ECC
-	push {r4-r7,lr}
-	sub sp, 0x18
-	adds r4, r2, 0
-	adds r5, r3, 0
-	ldr r6, [sp, 0x2C]
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r5, 16
-	lsrs r5, 16
-	lsls r6, 24
-	lsrs r6, 24
-	mov r3, sp
-	ldr r2, _08096F44 @ =gUnknown_83D4068
-	str r2, [sp]
-	movs r2, 0
-	str r2, [sp, 0x4]
-	ldr r2, _08096F48 @ =gUnknown_83D40AC
-	str r2, [sp, 0x8]
-	ldr r2, _08096F4C @ =gUnknown_83D40E0
-	str r2, [sp, 0xC]
-	str r1, [sp, 0x10]
-	ldr r2, _08096F50 @ =gUnknown_83D3E80
-	adds r2, r0, r2
-	ldr r7, _08096F54 @ =0x0000dac0
-	adds r1, r7, 0
-	ldrb r2, [r2]
-	adds r1, r2
-	strh r1, [r3, 0x14]
-	ldr r1, [sp, 0x30]
-	bl sub_8097028
-	str r0, [sp, 0x4]
-	lsls r4, 16
-	asrs r4, 16
-	lsls r5, 16
-	asrs r5, 16
-	mov r0, sp
-	adds r1, r4, 0
-	adds r2, r5, 0
-	adds r3, r6, 0
-	bl CreateMonIconSprite
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r0, r4, 4
-	adds r0, r4
-	lsls r0, 2
-	ldr r1, _08096F58 @ =gSprites
-	adds r0, r1
-	bl UpdateMonIconFrame
-	adds r0, r4, 0
-	add sp, 0x18
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08096F44: .4byte gUnknown_83D4068
-_08096F48: .4byte gUnknown_83D40AC
-_08096F4C: .4byte gUnknown_83D40E0
-_08096F50: .4byte gUnknown_83D3E80
-_08096F54: .4byte 0x0000dac0
-_08096F58: .4byte gSprites
-	thumb_func_end sub_8096ECC
-
-	thumb_func_start mon_icon_convert_unown_species_id
-mon_icon_convert_unown_species_id: @ 8096F5C
-	push {lr}
-	lsls r0, 16
-	lsrs r2, r0, 16
-	cmp r2, 0xC9
-	bne _08096F86
-	adds r0, r1, 0
-	bl GetUnownLetterByPersonality
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0
-	bne _08096F78
-	movs r0, 0xC9
-	b _08096F82
-_08096F78:
-	movs r1, 0xCE
-	lsls r1, 1
-	adds r0, r1
-	lsls r0, 16
-	lsrs r0, 16
-_08096F82:
-	adds r1, r0, 0
-	b _08096F92
-_08096F86:
-	movs r0, 0xCE
-	lsls r0, 1
-	adds r1, r2, 0
-	cmp r1, r0
-	bls _08096F92
-	movs r1, 0
-_08096F92:
-	adds r0, r1, 0
-	pop {r1}
-	bx r1
-	thumb_func_end mon_icon_convert_unown_species_id
-
-	thumb_func_start GetUnownLetterByPersonality
-GetUnownLetterByPersonality: @ 8096F98
-	push {lr}
-	adds r2, r0, 0
-	cmp r2, 0
-	beq _08096FCE
-	movs r0, 0xC0
-	lsls r0, 18
-	ands r0, r2
-	lsrs r0, 18
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r2
-	lsrs r1, 12
-	orrs r0, r1
-	movs r1, 0xC0
-	lsls r1, 2
-	ands r1, r2
-	lsrs r1, 6
-	orrs r0, r1
-	movs r1, 0x3
-	ands r1, r2
-	orrs r0, r1
-	movs r1, 0x1C
-	bl __umodsi3
-	lsls r0, 16
-	lsrs r0, 16
-	b _08096FD0
-_08096FCE:
-	movs r0, 0
-_08096FD0:
-	pop {r1}
-	bx r1
-	thumb_func_end GetUnownLetterByPersonality
-
-	thumb_func_start sub_8096FD4
-sub_8096FD4: @ 8096FD4
-	push {r4,lr}
-	sub sp, 0x4
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r4, 0
-	mov r1, sp
-	bl MailSpeciesToSpecies
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0xC9
-	bne _0809700A
-	mov r0, sp
-	ldrh r0, [r0]
-	cmp r0, 0
-	bne _08096FFA
-	mov r1, sp
-	adds r0, 0xC9
-	b _08097002
-_08096FFA:
-	mov r1, sp
-	movs r2, 0xCE
-	lsls r2, 1
-	adds r0, r2
-_08097002:
-	strh r0, [r1]
-	mov r0, sp
-	ldrh r0, [r0]
-	b _08097020
-_0809700A:
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r4, r0
-	bls _08097014
-	movs r4, 0
-_08097014:
-	adds r0, r4, 0
-	movs r1, 0
-	bl mon_icon_convert_unown_species_id
-	lsls r0, 16
-	lsrs r0, 16
-_08097020:
-	add sp, 0x4
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8096FD4
-
-	thumb_func_start sub_8097028
-sub_8097028: @ 8097028
-	push {lr}
-	adds r3, r1, 0
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r2, _08097050 @ =gUnknown_83D37A0
-	lsls r1, r0, 2
-	adds r1, r2
-	ldr r2, [r1]
-	movs r1, 0xCD
-	lsls r1, 1
-	cmp r0, r1
-	bne _0809704A
-	cmp r3, 0x1
-	bne _0809704A
-	movs r0, 0x80
-	lsls r0, 3
-	adds r2, r0
-_0809704A:
-	adds r0, r2, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08097050: .4byte gUnknown_83D37A0
-	thumb_func_end sub_8097028
-
-	thumb_func_start GetMonIconPtr
-GetMonIconPtr: @ 8097054
-	push {r4,lr}
-	adds r4, r2, 0
-	lsls r0, 16
-	lsrs r0, 16
-	bl mon_icon_convert_unown_species_id
-	lsls r0, 16
-	lsrs r0, 16
-	adds r1, r4, 0
-	bl sub_8097028
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end GetMonIconPtr
-
-	thumb_func_start sub_8097070
-sub_8097070: @ 8097070
-	push {lr}
-	bl sub_80973D8
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8097070
-
-	thumb_func_start sub_809707C
-sub_809707C: @ 809707C
-	push {r4,r5,lr}
-	movs r4, 0
-	ldr r5, _0809709C @ =gUnknown_83D4038
-_08097082:
-	lsls r0, r4, 3
-	adds r0, r5
-	bl LoadSpritePalette
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x5
-	bls _08097082
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809709C: .4byte gUnknown_83D4038
-	thumb_func_end sub_809707C
-
-	thumb_func_start SafeLoadMonIconPalette
-SafeLoadMonIconPalette: @ 80970A0
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r1, r0, 16
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r1, r0
-	bls _080970B0
-	movs r1, 0
-_080970B0:
-	ldr r0, _080970D8 @ =gUnknown_83D3E80
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	ldr r1, _080970DC @ =gUnknown_83D4038
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x4]
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xFF
-	bne _080970D0
-	adds r0, r4, 0
-	bl LoadSpritePalette
-_080970D0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080970D8: .4byte gUnknown_83D3E80
-_080970DC: .4byte gUnknown_83D4038
-	thumb_func_end SafeLoadMonIconPalette
-
-	thumb_func_start sub_80970E0
-sub_80970E0: @ 80970E0
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r1, _0809710C @ =gUnknown_83D3E80
-	adds r0, r1
-	ldrb r0, [r0]
-	ldr r1, _08097110 @ =gUnknown_83D4038
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x4]
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xFF
-	bne _08097106
-	adds r0, r4, 0
-	bl LoadSpritePalette
-_08097106:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809710C: .4byte gUnknown_83D3E80
-_08097110: .4byte gUnknown_83D4038
-	thumb_func_end sub_80970E0
-
-	thumb_func_start FreeMonIconPalettes
-FreeMonIconPalettes: @ 8097114
-	push {r4,r5,lr}
-	movs r4, 0
-	ldr r5, _08097134 @ =gUnknown_83D4038
-_0809711A:
-	lsls r0, r4, 3
-	adds r0, r5
-	ldrh r0, [r0, 0x4]
-	bl FreeSpritePaletteByTag
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x5
-	bls _0809711A
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08097134: .4byte gUnknown_83D4038
-	thumb_func_end FreeMonIconPalettes
-
-	thumb_func_start sub_8097138
-sub_8097138: @ 8097138
-	push {lr}
-	lsls r0, 16
-	lsrs r1, r0, 16
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r1, r0
-	bls _08097148
-	movs r1, 0
-_08097148:
-	ldr r0, _08097160 @ =gUnknown_83D3E80
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	ldr r1, _08097164 @ =gUnknown_83D4038
-	lsls r0, 3
-	adds r0, r1
-	ldrh r0, [r0, 0x4]
-	bl FreeSpritePaletteByTag
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08097160: .4byte gUnknown_83D3E80
-_08097164: .4byte gUnknown_83D4038
-	thumb_func_end sub_8097138
-
-	thumb_func_start sub_8097168
-sub_8097168: @ 8097168
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r1, _08097184 @ =gUnknown_83D3E80
-	adds r0, r1
-	ldrb r0, [r0]
-	ldr r1, _08097188 @ =gUnknown_83D4038
-	lsls r0, 3
-	adds r0, r1
-	ldrh r0, [r0, 0x4]
-	bl FreeSpritePaletteByTag
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08097184: .4byte gUnknown_83D3E80
-_08097188: .4byte gUnknown_83D4038
-	thumb_func_end sub_8097168
-
-	thumb_func_start sub_809718C
-sub_809718C: @ 809718C
-	push {lr}
-	bl UpdateMonIconFrame
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809718C
-
-	thumb_func_start sub_8097198
-sub_8097198: @ 8097198
-	push {r4-r6,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0xA0
-	bhi _080971C0
-	ldr r6, _080971C8 @ =gUnknown_83D4038
-	movs r5, 0x5
-_080971A6:
-	ldr r0, [r6]
-	adds r1, r4, 0
-	movs r2, 0x20
-	bl LoadPalette
-	adds r0, r4, 0
-	adds r0, 0x10
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r6, 0x8
-	subs r5, 0x1
-	cmp r5, 0
-	bge _080971A6
-_080971C0:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080971C8: .4byte gUnknown_83D4038
-	thumb_func_end sub_8097198
-
-	thumb_func_start GetValidMonIconPalettePtr
-GetValidMonIconPalettePtr: @ 80971CC
-	push {lr}
-	lsls r0, 16
-	lsrs r2, r0, 16
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r2, r0
-	bls _080971DC
-	movs r2, 0
-_080971DC:
-	ldr r1, _080971F0 @ =gUnknown_83D4038
-	ldr r0, _080971F4 @ =gUnknown_83D3E80
-	adds r0, r2, r0
-	ldrb r0, [r0]
-	lsls r0, 3
-	adds r0, r1
-	ldr r0, [r0]
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080971F0: .4byte gUnknown_83D4038
-_080971F4: .4byte gUnknown_83D3E80
-	thumb_func_end GetValidMonIconPalettePtr
-
-	thumb_func_start sub_80971F8
-sub_80971F8: @ 80971F8
-	push {lr}
-	lsls r0, 16
-	lsrs r1, r0, 16
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r1, r0
-	bls _08097208
-	movs r1, 0
-_08097208:
-	ldr r0, _08097214 @ =gUnknown_83D3E80
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08097214: .4byte gUnknown_83D3E80
-	thumb_func_end sub_80971F8
-
-	thumb_func_start sub_8097218
-sub_8097218: @ 8097218
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r1, _08097224 @ =gUnknown_83D3E80
-	adds r0, r1
-	ldrb r0, [r0]
-	bx lr
-	.align 2, 0
-_08097224: .4byte gUnknown_83D3E80
-	thumb_func_end sub_8097218
-
-	thumb_func_start UpdateMonIconFrame
-UpdateMonIconFrame: @ 8097228
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	adds r4, r0, 0
-	movs r7, 0
-	adds r6, r4, 0
-	adds r6, 0x2C
-	ldrb r2, [r6]
-	movs r0, 0x3F
-	mov r9, r0
-	ands r0, r2
-	cmp r0, 0
-	bne _080972DC
-	movs r1, 0x2A
-	adds r1, r4
-	mov r8, r1
-	ldrb r1, [r1]
-	ldr r0, [r4, 0x8]
-	lsls r1, 2
-	adds r1, r0
-	adds r5, r4, 0
-	adds r5, 0x2B
-	ldrb r0, [r5]
-	ldr r1, [r1]
-	lsls r0, 2
-	adds r0, r1
-	movs r1, 0
-	ldrsh r3, [r0, r1]
-	movs r0, 0x2
-	negs r0, r0
-	cmp r3, r0
-	beq _08097272
-	adds r0, 0x1
-	cmp r3, r0
-	bne _08097276
-	b _080972F0
-_08097272:
-	strb r7, [r5]
-	b _080972F0
-_08097276:
-	ldr r2, _080972D4 @ =gUnknown_83D40E8
-	ldrb r1, [r4, 0x3]
-	lsrs r1, 6
-	lsls r1, 1
-	ldrb r0, [r4, 0x1]
-	lsrs r0, 6
-	lsls r0, 3
-	adds r1, r0
-	adds r1, r2
-	ldrh r2, [r1]
-	adds r1, r2, 0
-	muls r1, r3
-	ldr r0, [r4, 0xC]
-	adds r0, r1
-	ldrh r1, [r4, 0x4]
-	lsls r1, 22
-	lsrs r1, 17
-	ldr r3, _080972D8 @ =0x06010000
-	adds r1, r3
-	bl RequestSpriteCopy
-	mov r0, r8
-	ldrb r1, [r0]
-	ldr r0, [r4, 0x8]
-	lsls r1, 2
-	adds r1, r0
-	ldrb r0, [r5]
-	ldr r1, [r1]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	lsls r0, 10
-	lsrs r0, 26
-	mov r1, r9
-	ands r1, r0
-	ldrb r2, [r6]
-	movs r0, 0x40
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r6]
-	ldrb r0, [r5]
-	adds r0, 0x1
-	strb r0, [r5]
-	ldrb r7, [r5]
-	b _080972F0
-	.align 2, 0
-_080972D4: .4byte gUnknown_83D40E8
-_080972D8: .4byte 0x06010000
-_080972DC:
-	lsls r0, r2, 26
-	lsrs r0, 26
-	subs r0, 0x1
-	movs r1, 0x3F
-	ands r0, r1
-	movs r1, 0x40
-	negs r1, r1
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r6]
-_080972F0:
-	adds r0, r7, 0
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end UpdateMonIconFrame
-
-	thumb_func_start CreateMonIconSprite
-CreateMonIconSprite: @ 8097300
-	push {r4-r6,lr}
-	mov r6, r9
-	mov r5, r8
-	push {r5,r6}
-	sub sp, 0x38
-	mov r9, r0
-	adds r4, r1, 0
-	adds r5, r2, 0
-	mov r8, r3
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r5, 16
-	lsrs r5, 16
-	mov r0, r8
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	movs r0, 0
-	str r0, [sp, 0x30]
-	ldr r2, _080973C8 @ =gUnknown_83D40E8
-	mov r0, r9
-	ldr r6, [r0]
-	ldrb r1, [r6, 0x3]
-	lsrs r1, 6
-	lsls r1, 1
-	ldrb r0, [r6, 0x1]
-	lsrs r0, 6
-	lsls r0, 3
-	adds r1, r0
-	adds r1, r2
-	ldrh r2, [r1]
-	ldr r1, _080973CC @ =0xffff0000
-	add r3, sp, 0x30
-	ldr r0, [r3, 0x4]
-	ands r0, r1
-	orrs r0, r2
-	str r0, [r3, 0x4]
-	add r1, sp, 0x18
-	ldr r0, _080973D0 @ =0x0000ffff
-	strh r0, [r1]
-	mov r0, r9
-	ldrh r2, [r0, 0x14]
-	mov r0, sp
-	adds r0, 0x1A
-	strh r2, [r0]
-	str r6, [sp, 0x1C]
-	mov r2, r9
-	ldr r0, [r2, 0x8]
-	str r0, [sp, 0x20]
-	str r3, [sp, 0x24]
-	ldr r0, [r2, 0xC]
-	str r0, [sp, 0x28]
-	ldr r0, [r2, 0x10]
-	str r0, [sp, 0x2C]
-	mov r0, sp
-	movs r2, 0x18
-	bl memcpy
-	lsls r4, 16
-	asrs r4, 16
-	lsls r5, 16
-	asrs r5, 16
-	mov r0, sp
-	adds r1, r4, 0
-	adds r2, r5, 0
-	mov r3, r8
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r6, _080973D4 @ =gSprites
-	lsls r3, r0, 4
-	adds r3, r0
-	lsls r3, 2
-	adds r4, r3, r6
-	adds r5, r4, 0
-	adds r5, 0x2C
-	ldrb r1, [r5]
-	movs r2, 0x40
-	orrs r1, r2
-	strb r1, [r5]
-	adds r4, 0x3F
-	ldrb r2, [r4]
-	movs r1, 0x5
-	negs r1, r1
-	ands r1, r2
-	strb r1, [r4]
-	adds r6, 0xC
-	adds r3, r6
-	mov r2, r9
-	ldr r1, [r2, 0x4]
-	str r1, [r3]
-	add sp, 0x38
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080973C8: .4byte gUnknown_83D40E8
-_080973CC: .4byte 0xffff0000
-_080973D0: .4byte 0x0000ffff
-_080973D4: .4byte gSprites
-	thumb_func_end CreateMonIconSprite
-
-	thumb_func_start sub_80973D8
-sub_80973D8: @ 80973D8
-	push {lr}
-	sub sp, 0x8
-	movs r1, 0
-	str r1, [sp]
-	ldr r3, _0809740C @ =gUnknown_83D40E8
-	ldrb r2, [r0, 0x3]
-	lsrs r2, 6
-	lsls r2, 1
-	ldrb r1, [r0, 0x1]
-	lsrs r1, 6
-	lsls r1, 3
-	adds r2, r1
-	adds r2, r3
-	ldrh r3, [r2]
-	ldr r2, _08097410 @ =0xffff0000
-	ldr r1, [sp, 0x4]
-	ands r1, r2
-	orrs r1, r3
-	str r1, [sp, 0x4]
-	mov r1, sp
-	str r1, [r0, 0xC]
-	bl DestroySprite
-	add sp, 0x8
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0809740C: .4byte gUnknown_83D40E8
-_08097410: .4byte 0xffff0000
-	thumb_func_end sub_80973D8
-
-	thumb_func_start sub_8097414
-sub_8097414: @ 8097414
-	mov r12, r0
-	adds r0, 0x2A
-	movs r3, 0
-	strb r1, [r0]
-	mov r2, r12
-	adds r2, 0x2C
-	ldrb r1, [r2]
-	movs r0, 0x40
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2]
-	mov r0, r12
-	adds r0, 0x2B
-	strb r3, [r0]
-	bx lr
-	thumb_func_end sub_8097414
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index f1188910d..71e0e2e0e 100644
--- a/asm/pokemon_storage_system.s
+++ b/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
@@ -11179,7 +11179,7 @@ _08091248:
 	lsrs r4, 16
 	adds r0, r3, 0
 	movs r1, 0x1
-	bl sub_8097028
+	bl GetMonIconTiles
 	lsls r1, r4, 5
 	ldr r2, _08091288 @ =0x06010000
 	adds r1, r2
@@ -11271,11 +11271,11 @@ sub_80912E0: @ 80912E0
 	ldm r0!, {r3,r5,r7}
 	stm r2!, {r3,r5,r7}
 	adds r0, r6, 0
-	bl mon_icon_convert_unown_species_id
+	bl GetIconSpecies
 	mov r10, r0
 	mov r6, r10
 	mov r2, sp
-	ldr r1, _08091394 @ =gUnknown_83D3E80
+	ldr r1, _08091394 @ =gMonIconPaletteIndices
 	adds r1, r6, r1
 	ldr r3, _08091398 @ =0x0000dac0
 	adds r0, r3, 0
@@ -11329,7 +11329,7 @@ sub_80912E0: @ 80912E0
 	b _080913B4
 	.align 2, 0
 _08091390: .4byte gUnknown_83CEBF0
-_08091394: .4byte gUnknown_83D3E80
+_08091394: .4byte gMonIconPaletteIndices
 _08091398: .4byte 0x0000dac0
 _0809139C: .4byte 0x0000ffff
 _080913A0: .4byte gSprites
@@ -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
@@ -19954,7 +19954,7 @@ sub_80956A4: @ 80956A4
 	bl GetMonIconPtr
 	adds r4, r0, 0
 	adds r0, r5, 0
-	bl sub_80971F8
+	bl GetValidMonIconPalIndex
 	adds r0, 0x8
 	lsls r0, 24
 	lsrs r0, 24
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index f6f746313..8a01dcfb6 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -10814,7 +10814,7 @@ _08139E58:
 	adds r0, r5, 0
 	movs r2, 0x18
 	movs r3, 0x20
-	bl sub_8096E18
+	bl CreateMonIcon
 	ldr r1, [r6]
 	ldr r2, _08139E9C @ =0x00003014
 	adds r1, r2
@@ -10916,7 +10916,7 @@ sub_8139F20: @ 8139F20
 	bl GetMonData
 	lsls r0, 16
 	lsrs r0, 16
-	bl sub_8097138
+	bl SafeFreeMonIconPalette
 	ldr r0, [r4]
 	ldr r1, _08139F5C @ =0x00003014
 	adds r0, r1
@@ -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
diff --git a/asm/trade.s b/asm/trade.s
index 3573dcfaf..b5e8ee022 100644
--- a/asm/trade.s
+++ b/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,8 +521,8 @@ _0804CA4A:
 	str r0, [sp, 0x4]
 	str r1, [sp, 0x8]
 	adds r0, r5, 0
-	ldr r1, _0804CB44 @ =sub_809718C
-	bl sub_8096E18
+	ldr r1, _0804CB44 @ =SpriteCB_MonIcon
+	bl CreateMonIcon
 	mov r2, r8
 	ldr r1, [r2]
 	adds r1, 0x28
@@ -580,8 +580,8 @@ _0804CABE:
 	movs r0, 0
 	str r0, [sp, 0x8]
 	adds r0, r5, 0
-	ldr r1, _0804CB44 @ =sub_809718C
-	bl sub_8096E18
+	ldr r1, _0804CB44 @ =SpriteCB_MonIcon
+	bl CreateMonIcon
 	mov r2, r8
 	ldr r1, [r2]
 	adds r1, 0x2E
@@ -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,8 +1211,8 @@ _0804D048:
 	str r0, [sp, 0x4]
 	str r1, [sp, 0x8]
 	adds r0, r5, 0
-	ldr r1, _0804D144 @ =sub_809718C
-	bl sub_8096E18
+	ldr r1, _0804D144 @ =SpriteCB_MonIcon
+	bl CreateMonIcon
 	mov r2, r8
 	ldr r1, [r2]
 	adds r1, 0x28
@@ -1270,8 +1270,8 @@ _0804D0BE:
 	movs r0, 0
 	str r0, [sp, 0x8]
 	adds r0, r5, 0
-	ldr r1, _0804D144 @ =sub_809718C
-	bl sub_8096E18
+	ldr r1, _0804D144 @ =SpriteCB_MonIcon
+	bl CreateMonIcon
 	mov r2, r8
 	ldr r1, [r2]
 	adds r1, 0x2E
@@ -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
diff --git a/asm/trainer_card.s b/asm/trainer_card.s
index 1ebda42ab..1e97ba2de 100644
--- a/asm/trainer_card.s
+++ b/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]
@@ -3203,7 +3203,7 @@ _0808AAA4:
 	ldrh r0, [r1]
 	cmp r0, 0
 	beq _0808AAEE
-	bl sub_8097218
+	bl GetMonIconPaletteIndexFromSpecies
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r4, 20
@@ -3250,7 +3250,7 @@ _0808AB0C: .4byte 0x00000457
 sub_808AB10: @ 808AB10
 	push {r4,r5,lr}
 	sub sp, 0x4
-	ldr r0, _0808AB40 @ =gUnknown_83D3740
+	ldr r0, _0808AB40 @ =gMonIconPalettes
 	ldr r4, _0808AB44 @ =gUnknown_20397A4
 	ldr r1, [r4]
 	ldr r5, _0808AB48 @ =0x00000396
@@ -3271,7 +3271,7 @@ sub_808AB10: @ 808AB10
 	beq _0808AB80
 	b _0808AB88
 	.align 2, 0
-_0808AB40: .4byte gUnknown_83D3740
+_0808AB40: .4byte gMonIconPalettes
 _0808AB44: .4byte gUnknown_20397A4
 _0808AB48: .4byte 0x00000396
 _0808AB4C: .4byte 0x000004aa
@@ -3322,7 +3322,7 @@ _0808AB9A:
 	adds r0, r1
 	ldrh r0, [r0]
 	movs r1, 0
-	bl sub_8097028
+	bl GetMonIconTiles
 	adds r1, r0, 0
 	lsls r3, r4, 20
 	movs r0, 0x80
diff --git a/baserom.ips b/baserom.ips
index 59b01f31f..62b419ab9 100644
--- a/baserom.ips
+++ b/baserom.ips
diff --git a/data/data_835B488.s b/data/data_835B488.s
index a1893150d..10ade9a52 100644
--- a/data/data_835B488.s
+++ b/data/data_835B488.s
@@ -511,30 +511,10 @@ gUnknown_83D35DC:: @ 83D35DC
 gUnknown_83D3728:: @ 83D3728
 	.incbin "baserom.gba", 0x3D3728, 0x18
 
-gUnknown_83D3740:: @ 83D3740
-	.incbin "baserom.gba", 0x3D3740, 0x60
-
-gUnknown_83D37A0:: @ 83D37A0
-	.incbin "baserom.gba", 0x3D37A0, 0x6E0
-
-gUnknown_83D3E80:: @ 83D3E80
-	.incbin "baserom.gba", 0x3D3E80, 0x1B8
-
-gUnknown_83D4038:: @ 83D4038
-	.incbin "baserom.gba", 0x3D4038, 0x30
-
-gUnknown_83D4068:: @ 83D4068
-	.incbin "baserom.gba", 0x3D4068, 0x44
-
-gUnknown_83D40AC:: @ 83D40AC
-	.incbin "baserom.gba", 0x3D40AC, 0x34
-
-gUnknown_83D40E0:: @ 83D40E0
-	.incbin "baserom.gba", 0x3D40E0, 0x8
-
-gUnknown_83D40E8:: @ 83D40E8
-	.incbin "baserom.gba", 0x3D40E8, 0x18
-
+	@ pokemon_icon
+	.section .rodata.83D4100
+	.align 2
+	@ fldeff_cut
 gUnknown_83D4100:: @ 83D4100
 	.incbin "baserom.gba", 0x3D4100, 0x4C
 
diff --git a/data/graphics.s b/data/graphics.s
index 78c955d0f..12a709ad0 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -2608,7 +2608,7 @@ gFile_graphics_pokemon_palettes_bulbasaur_shiny_palette:: @ 8D30164
 	.incbin "graphics/pokemon/bulbasaur/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_bulbasaur_icon:: @ 8D3018C
+gMonIcon_Bulbasaur:: @ 8D3018C
 	.incbin "graphics/pokemon/bulbasaur/icon.4bpp"
 
 	.align 2
@@ -2632,7 +2632,7 @@ gFile_graphics_pokemon_palettes_ivysaur_shiny_palette:: @ 8D30C64
 	.incbin "graphics/pokemon/ivysaur/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_ivysaur_icon:: @ 8D30C8C
+gMonIcon_Ivysaur:: @ 8D30C8C
 	.incbin "graphics/pokemon/ivysaur/icon.4bpp"
 
 	.align 2
@@ -2656,7 +2656,7 @@ gFile_graphics_pokemon_palettes_venusaur_shiny_palette:: @ 8D31ADC
 	.incbin "graphics/pokemon/venusaur/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_venusaur_icon:: @ 8D31B04
+gMonIcon_Venusaur:: @ 8D31B04
 	.incbin "graphics/pokemon/venusaur/icon.4bpp"
 
 	.align 2
@@ -2680,7 +2680,7 @@ gFile_graphics_pokemon_palettes_charmander_shiny_palette:: @ 8D32470
 	.incbin "graphics/pokemon/charmander/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_charmander_icon:: @ 8D32498
+gMonIcon_Charmander:: @ 8D32498
 	.incbin "graphics/pokemon/charmander/icon.4bpp"
 
 	.align 2
@@ -2704,7 +2704,7 @@ gFile_graphics_pokemon_palettes_charmeleon_shiny_palette:: @ 8D32F80
 	.incbin "graphics/pokemon/charmeleon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_charmeleon_icon:: @ 8D32FA8
+gMonIcon_Charmeleon:: @ 8D32FA8
 	.incbin "graphics/pokemon/charmeleon/icon.4bpp"
 
 	.align 2
@@ -2728,7 +2728,7 @@ gFile_graphics_pokemon_palettes_charizard_shiny_palette:: @ 8D33CF8
 	.incbin "graphics/pokemon/charizard/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_charizard_icon:: @ 8D33D20
+gMonIcon_Charizard:: @ 8D33D20
 	.incbin "graphics/pokemon/charizard/icon.4bpp"
 
 	.align 2
@@ -2752,7 +2752,7 @@ gFile_graphics_pokemon_palettes_squirtle_shiny_palette:: @ 8D3468C
 	.incbin "graphics/pokemon/squirtle/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_squirtle_icon:: @ 8D346B4
+gMonIcon_Squirtle:: @ 8D346B4
 	.incbin "graphics/pokemon/squirtle/icon.4bpp"
 
 	.align 2
@@ -2776,7 +2776,7 @@ gFile_graphics_pokemon_palettes_wartortle_shiny_palette:: @ 8D351F0
 	.incbin "graphics/pokemon/wartortle/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_wartortle_icon:: @ 8D35218
+gMonIcon_Wartortle:: @ 8D35218
 	.incbin "graphics/pokemon/wartortle/icon.4bpp"
 
 	.align 2
@@ -2800,7 +2800,7 @@ gFile_graphics_pokemon_palettes_blastoise_shiny_palette:: @ 8D35F78
 	.incbin "graphics/pokemon/blastoise/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_blastoise_icon:: @ 8D35FA0
+gMonIcon_Blastoise:: @ 8D35FA0
 	.incbin "graphics/pokemon/blastoise/icon.4bpp"
 
 	.align 2
@@ -2824,7 +2824,7 @@ gFile_graphics_pokemon_palettes_caterpie_shiny_palette:: @ 8D368C8
 	.incbin "graphics/pokemon/caterpie/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_caterpie_icon:: @ 8D368F0
+gMonIcon_Caterpie:: @ 8D368F0
 	.incbin "graphics/pokemon/caterpie/icon.4bpp"
 
 	.align 2
@@ -2848,7 +2848,7 @@ gFile_graphics_pokemon_palettes_metapod_shiny_palette:: @ 8D37168
 	.incbin "graphics/pokemon/metapod/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_metapod_icon:: @ 8D37188
+gMonIcon_Metapod:: @ 8D37188
 	.incbin "graphics/pokemon/metapod/icon.4bpp"
 
 	.align 2
@@ -2872,7 +2872,7 @@ gFile_graphics_pokemon_palettes_butterfree_shiny_palette:: @ 8D37D4C
 	.incbin "graphics/pokemon/butterfree/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_butterfree_icon:: @ 8D37D74
+gMonIcon_Butterfree:: @ 8D37D74
 	.incbin "graphics/pokemon/butterfree/icon.4bpp"
 
 	.align 2
@@ -2896,7 +2896,7 @@ gFile_graphics_pokemon_palettes_weedle_shiny_palette:: @ 8D38660
 	.incbin "graphics/pokemon/weedle/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_weedle_icon:: @ 8D38688
+gMonIcon_Weedle:: @ 8D38688
 	.incbin "graphics/pokemon/weedle/icon.4bpp"
 
 	.align 2
@@ -2920,7 +2920,7 @@ gFile_graphics_pokemon_palettes_kakuna_shiny_palette:: @ 8D38F90
 	.incbin "graphics/pokemon/kakuna/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_kakuna_icon:: @ 8D38FB4
+gMonIcon_Kakuna:: @ 8D38FB4
 	.incbin "graphics/pokemon/kakuna/icon.4bpp"
 
 	.align 2
@@ -2944,7 +2944,7 @@ gFile_graphics_pokemon_palettes_beedrill_shiny_palette:: @ 8D39B90
 	.incbin "graphics/pokemon/beedrill/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_beedrill_icon:: @ 8D39BB8
+gMonIcon_Beedrill:: @ 8D39BB8
 	.incbin "graphics/pokemon/beedrill/icon.4bpp"
 
 	.align 2
@@ -2968,7 +2968,7 @@ gFile_graphics_pokemon_palettes_pidgey_shiny_palette:: @ 8D3A5CC
 	.incbin "graphics/pokemon/pidgey/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_pidgey_icon:: @ 8D3A5F4
+gMonIcon_Pidgey:: @ 8D3A5F4
 	.incbin "graphics/pokemon/pidgey/icon.4bpp"
 
 	.align 2
@@ -2992,7 +2992,7 @@ gFile_graphics_pokemon_palettes_pidgeotto_shiny_palette:: @ 8D3B120
 	.incbin "graphics/pokemon/pidgeotto/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_pidgeotto_icon:: @ 8D3B148
+gMonIcon_Pidgeotto:: @ 8D3B148
 	.incbin "graphics/pokemon/pidgeotto/icon.4bpp"
 
 	.align 2
@@ -3016,7 +3016,7 @@ gFile_graphics_pokemon_palettes_pidgeot_shiny_palette:: @ 8D3BE64
 	.incbin "graphics/pokemon/pidgeot/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_pidgeot_icon:: @ 8D3BE8C
+gMonIcon_Pidgeot:: @ 8D3BE8C
 	.incbin "graphics/pokemon/pidgeot/icon.4bpp"
 
 	.align 2
@@ -3040,7 +3040,7 @@ gFile_graphics_pokemon_palettes_rattata_shiny_palette:: @ 8D3C7E4
 	.incbin "graphics/pokemon/rattata/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_rattata_icon:: @ 8D3C80C
+gMonIcon_Rattata:: @ 8D3C80C
 	.incbin "graphics/pokemon/rattata/icon.4bpp"
 
 	.align 2
@@ -3064,7 +3064,7 @@ gFile_graphics_pokemon_palettes_raticate_shiny_palette:: @ 8D3D2F4
 	.incbin "graphics/pokemon/raticate/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_raticate_icon:: @ 8D3D31C
+gMonIcon_Raticate:: @ 8D3D31C
 	.incbin "graphics/pokemon/raticate/icon.4bpp"
 
 	.align 2
@@ -3088,7 +3088,7 @@ gFile_graphics_pokemon_palettes_spearow_shiny_palette:: @ 8D3DD00
 	.incbin "graphics/pokemon/spearow/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_spearow_icon:: @ 8D3DD28
+gMonIcon_Spearow:: @ 8D3DD28
 	.incbin "graphics/pokemon/spearow/icon.4bpp"
 
 	.align 2
@@ -3112,7 +3112,7 @@ gFile_graphics_pokemon_palettes_fearow_shiny_palette:: @ 8D3E924
 	.incbin "graphics/pokemon/fearow/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_fearow_icon:: @ 8D3E94C
+gMonIcon_Fearow:: @ 8D3E94C
 	.incbin "graphics/pokemon/fearow/icon.4bpp"
 
 	.align 2
@@ -3136,7 +3136,7 @@ gFile_graphics_pokemon_palettes_ekans_shiny_palette:: @ 8D3F34C
 	.incbin "graphics/pokemon/ekans/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_ekans_icon:: @ 8D3F374
+gMonIcon_Ekans:: @ 8D3F374
 	.incbin "graphics/pokemon/ekans/icon.4bpp"
 
 	.align 2
@@ -3160,7 +3160,7 @@ gFile_graphics_pokemon_palettes_arbok_shiny_palette:: @ 8D3FEB8
 	.incbin "graphics/pokemon/arbok/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_arbok_icon:: @ 8D3FEE0
+gMonIcon_Arbok:: @ 8D3FEE0
 	.incbin "graphics/pokemon/arbok/icon.4bpp"
 
 	.align 2
@@ -3184,7 +3184,7 @@ gFile_graphics_pokemon_palettes_pikachu_shiny_palette:: @ 8D408D0
 	.incbin "graphics/pokemon/pikachu/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_pikachu_icon:: @ 8D408F8
+gMonIcon_Pikachu:: @ 8D408F8
 	.incbin "graphics/pokemon/pikachu/icon.4bpp"
 
 	.align 2
@@ -3208,7 +3208,7 @@ gFile_graphics_pokemon_palettes_raichu_shiny_palette:: @ 8D41458
 	.incbin "graphics/pokemon/raichu/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_raichu_icon:: @ 8D41480
+gMonIcon_Raichu:: @ 8D41480
 	.incbin "graphics/pokemon/raichu/icon.4bpp"
 
 	.align 2
@@ -3232,7 +3232,7 @@ gFile_graphics_pokemon_palettes_sandshrew_shiny_palette:: @ 8D41ECC
 	.incbin "graphics/pokemon/sandshrew/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_sandshrew_icon:: @ 8D41EF4
+gMonIcon_Sandshrew:: @ 8D41EF4
 	.incbin "graphics/pokemon/sandshrew/icon.4bpp"
 
 	.align 2
@@ -3256,7 +3256,7 @@ gFile_graphics_pokemon_palettes_sandslash_shiny_palette:: @ 8D42B70
 	.incbin "graphics/pokemon/sandslash/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_sandslash_icon:: @ 8D42B98
+gMonIcon_Sandslash:: @ 8D42B98
 	.incbin "graphics/pokemon/sandslash/icon.4bpp"
 
 	.align 2
@@ -3280,7 +3280,7 @@ gFile_graphics_pokemon_palettes_nidoran_f_shiny_palette:: @ 8D43524
 	.incbin "graphics/pokemon/nidoran_f/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_nidoran_f_icon:: @ 8D4354C
+gMonIcon_Nidoran_f:: @ 8D4354C
 	.incbin "graphics/pokemon/nidoran_f/icon.4bpp"
 
 	.align 2
@@ -3304,7 +3304,7 @@ gFile_graphics_pokemon_palettes_nidorina_shiny_palette:: @ 8D44048
 	.incbin "graphics/pokemon/nidorina/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_nidorina_icon:: @ 8D44070
+gMonIcon_Nidorina:: @ 8D44070
 	.incbin "graphics/pokemon/nidorina/icon.4bpp"
 
 	.align 2
@@ -3328,7 +3328,7 @@ gFile_graphics_pokemon_palettes_nidoqueen_shiny_palette:: @ 8D44CA8
 	.incbin "graphics/pokemon/nidoqueen/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_nidoqueen_icon:: @ 8D44CD0
+gMonIcon_Nidoqueen:: @ 8D44CD0
 	.incbin "graphics/pokemon/nidoqueen/icon.4bpp"
 
 	.align 2
@@ -3352,7 +3352,7 @@ gFile_graphics_pokemon_palettes_nidoran_m_shiny_palette:: @ 8D456D8
 	.incbin "graphics/pokemon/nidoran_m/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_nidoran_m_icon:: @ 8D45700
+gMonIcon_Nidoran_m:: @ 8D45700
 	.incbin "graphics/pokemon/nidoran_m/icon.4bpp"
 
 	.align 2
@@ -3376,7 +3376,7 @@ gFile_graphics_pokemon_palettes_nidorino_shiny_palette:: @ 8D46288
 	.incbin "graphics/pokemon/nidorino/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_nidorino_icon:: @ 8D462B0
+gMonIcon_Nidorino:: @ 8D462B0
 	.incbin "graphics/pokemon/nidorino/icon.4bpp"
 
 	.align 2
@@ -3400,7 +3400,7 @@ gFile_graphics_pokemon_palettes_nidoking_shiny_palette:: @ 8D47070
 	.incbin "graphics/pokemon/nidoking/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_nidoking_icon:: @ 8D47098
+gMonIcon_Nidoking:: @ 8D47098
 	.incbin "graphics/pokemon/nidoking/icon.4bpp"
 
 	.align 2
@@ -3424,7 +3424,7 @@ gFile_graphics_pokemon_palettes_clefairy_shiny_palette:: @ 8D47A4C
 	.incbin "graphics/pokemon/clefairy/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_clefairy_icon:: @ 8D47A74
+gMonIcon_Clefairy:: @ 8D47A74
 	.incbin "graphics/pokemon/clefairy/icon.4bpp"
 
 	.align 2
@@ -3448,7 +3448,7 @@ gFile_graphics_pokemon_palettes_clefable_shiny_palette:: @ 8D48534
 	.incbin "graphics/pokemon/clefable/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_clefable_icon:: @ 8D4855C
+gMonIcon_Clefable:: @ 8D4855C
 	.incbin "graphics/pokemon/clefable/icon.4bpp"
 
 	.align 2
@@ -3472,7 +3472,7 @@ gFile_graphics_pokemon_palettes_vulpix_shiny_palette:: @ 8D48FD4
 	.incbin "graphics/pokemon/vulpix/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_vulpix_icon:: @ 8D48FFC
+gMonIcon_Vulpix:: @ 8D48FFC
 	.incbin "graphics/pokemon/vulpix/icon.4bpp"
 
 	.align 2
@@ -3496,7 +3496,7 @@ gFile_graphics_pokemon_palettes_ninetales_shiny_palette:: @ 8D49C84
 	.incbin "graphics/pokemon/ninetales/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_ninetales_icon:: @ 8D49CA8
+gMonIcon_Ninetales:: @ 8D49CA8
 	.incbin "graphics/pokemon/ninetales/icon.4bpp"
 
 	.align 2
@@ -3520,7 +3520,7 @@ gFile_graphics_pokemon_palettes_jigglypuff_shiny_palette:: @ 8D4A5D0
 	.incbin "graphics/pokemon/jigglypuff/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_jigglypuff_icon:: @ 8D4A5F8
+gMonIcon_Jigglypuff:: @ 8D4A5F8
 	.incbin "graphics/pokemon/jigglypuff/icon.4bpp"
 
 	.align 2
@@ -3544,7 +3544,7 @@ gFile_graphics_pokemon_palettes_wigglytuff_shiny_palette:: @ 8D4B04C
 	.incbin "graphics/pokemon/wigglytuff/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_wigglytuff_icon:: @ 8D4B074
+gMonIcon_Wigglytuff:: @ 8D4B074
 	.incbin "graphics/pokemon/wigglytuff/icon.4bpp"
 
 	.align 2
@@ -3568,7 +3568,7 @@ gFile_graphics_pokemon_palettes_zubat_shiny_palette:: @ 8D4BA34
 	.incbin "graphics/pokemon/zubat/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_zubat_icon:: @ 8D4BA5C
+gMonIcon_Zubat:: @ 8D4BA5C
 	.incbin "graphics/pokemon/zubat/icon.4bpp"
 
 	.align 2
@@ -3592,7 +3592,7 @@ gFile_graphics_pokemon_palettes_golbat_shiny_palette:: @ 8D4C500
 	.incbin "graphics/pokemon/golbat/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_golbat_icon:: @ 8D4C528
+gMonIcon_Golbat:: @ 8D4C528
 	.incbin "graphics/pokemon/golbat/icon.4bpp"
 
 	.align 2
@@ -3616,7 +3616,7 @@ gFile_graphics_pokemon_palettes_oddish_shiny_palette:: @ 8D4CE74
 	.incbin "graphics/pokemon/oddish/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_oddish_icon:: @ 8D4CE9C
+gMonIcon_Oddish:: @ 8D4CE9C
 	.incbin "graphics/pokemon/oddish/icon.4bpp"
 
 	.align 2
@@ -3640,7 +3640,7 @@ gFile_graphics_pokemon_palettes_gloom_shiny_palette:: @ 8D4D9CC
 	.incbin "graphics/pokemon/gloom/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_gloom_icon:: @ 8D4D9F4
+gMonIcon_Gloom:: @ 8D4D9F4
 	.incbin "graphics/pokemon/gloom/icon.4bpp"
 
 	.align 2
@@ -3664,7 +3664,7 @@ gFile_graphics_pokemon_palettes_vileplume_shiny_palette:: @ 8D4E5DC
 	.incbin "graphics/pokemon/vileplume/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_vileplume_icon:: @ 8D4E604
+gMonIcon_Vileplume:: @ 8D4E604
 	.incbin "graphics/pokemon/vileplume/icon.4bpp"
 
 	.align 2
@@ -3688,7 +3688,7 @@ gFile_graphics_pokemon_palettes_paras_shiny_palette:: @ 8D4EF58
 	.incbin "graphics/pokemon/paras/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_paras_icon:: @ 8D4EF80
+gMonIcon_Paras:: @ 8D4EF80
 	.incbin "graphics/pokemon/paras/icon.4bpp"
 
 	.align 2
@@ -3712,7 +3712,7 @@ gFile_graphics_pokemon_palettes_parasect_shiny_palette:: @ 8D4FA54
 	.incbin "graphics/pokemon/parasect/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_parasect_icon:: @ 8D4FA7C
+gMonIcon_Parasect:: @ 8D4FA7C
 	.incbin "graphics/pokemon/parasect/icon.4bpp"
 
 	.align 2
@@ -3736,7 +3736,7 @@ gFile_graphics_pokemon_palettes_venonat_shiny_palette:: @ 8D50514
 	.incbin "graphics/pokemon/venonat/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_venonat_icon:: @ 8D5053C
+gMonIcon_Venonat:: @ 8D5053C
 	.incbin "graphics/pokemon/venonat/icon.4bpp"
 
 	.align 2
@@ -3760,7 +3760,7 @@ gFile_graphics_pokemon_palettes_venomoth_shiny_palette:: @ 8D5112C
 	.incbin "graphics/pokemon/venomoth/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_venomoth_icon:: @ 8D51154
+gMonIcon_Venomoth:: @ 8D51154
 	.incbin "graphics/pokemon/venomoth/icon.4bpp"
 
 	.align 2
@@ -3784,7 +3784,7 @@ gFile_graphics_pokemon_palettes_diglett_shiny_palette:: @ 8D519B8
 	.incbin "graphics/pokemon/diglett/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_diglett_icon:: @ 8D519E0
+gMonIcon_Diglett:: @ 8D519E0
 	.incbin "graphics/pokemon/diglett/icon.4bpp"
 
 	.align 2
@@ -3808,7 +3808,7 @@ gFile_graphics_pokemon_palettes_dugtrio_shiny_palette:: @ 8D52400
 	.incbin "graphics/pokemon/dugtrio/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_dugtrio_icon:: @ 8D52428
+gMonIcon_Dugtrio:: @ 8D52428
 	.incbin "graphics/pokemon/dugtrio/icon.4bpp"
 
 	.align 2
@@ -3832,7 +3832,7 @@ gFile_graphics_pokemon_palettes_meowth_shiny_palette:: @ 8D52E40
 	.incbin "graphics/pokemon/meowth/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_meowth_icon:: @ 8D52E68
+gMonIcon_Meowth:: @ 8D52E68
 	.incbin "graphics/pokemon/meowth/icon.4bpp"
 
 	.align 2
@@ -3856,7 +3856,7 @@ gFile_graphics_pokemon_palettes_persian_shiny_palette:: @ 8D53968
 	.incbin "graphics/pokemon/persian/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_persian_icon:: @ 8D53990
+gMonIcon_Persian:: @ 8D53990
 	.incbin "graphics/pokemon/persian/icon.4bpp"
 
 	.align 2
@@ -3880,7 +3880,7 @@ gFile_graphics_pokemon_palettes_psyduck_shiny_palette:: @ 8D54358
 	.incbin "graphics/pokemon/psyduck/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_psyduck_icon:: @ 8D54380
+gMonIcon_Psyduck:: @ 8D54380
 	.incbin "graphics/pokemon/psyduck/icon.4bpp"
 
 	.align 2
@@ -3904,7 +3904,7 @@ gFile_graphics_pokemon_palettes_golduck_shiny_palette:: @ 8D54EAC
 	.incbin "graphics/pokemon/golduck/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_golduck_icon:: @ 8D54ED4
+gMonIcon_Golduck:: @ 8D54ED4
 	.incbin "graphics/pokemon/golduck/icon.4bpp"
 
 	.align 2
@@ -3928,7 +3928,7 @@ gFile_graphics_pokemon_palettes_mankey_shiny_palette:: @ 8D5597C
 	.incbin "graphics/pokemon/mankey/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_mankey_icon:: @ 8D559A4
+gMonIcon_Mankey:: @ 8D559A4
 	.incbin "graphics/pokemon/mankey/icon.4bpp"
 
 	.align 2
@@ -3952,7 +3952,7 @@ gFile_graphics_pokemon_palettes_primeape_shiny_palette:: @ 8D564E8
 	.incbin "graphics/pokemon/primeape/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_primeape_icon:: @ 8D56510
+gMonIcon_Primeape:: @ 8D56510
 	.incbin "graphics/pokemon/primeape/icon.4bpp"
 
 	.align 2
@@ -3976,7 +3976,7 @@ gFile_graphics_pokemon_palettes_growlithe_shiny_palette:: @ 8D56FBC
 	.incbin "graphics/pokemon/growlithe/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_growlithe_icon:: @ 8D56FE4
+gMonIcon_Growlithe:: @ 8D56FE4
 	.incbin "graphics/pokemon/growlithe/icon.4bpp"
 
 	.align 2
@@ -4000,7 +4000,7 @@ gFile_graphics_pokemon_palettes_arcanine_shiny_palette:: @ 8D57D08
 	.incbin "graphics/pokemon/arcanine/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_arcanine_icon:: @ 8D57D30
+gMonIcon_Arcanine:: @ 8D57D30
 	.incbin "graphics/pokemon/arcanine/icon.4bpp"
 
 	.align 2
@@ -4024,7 +4024,7 @@ gFile_graphics_pokemon_palettes_poliwag_shiny_palette:: @ 8D58678
 	.incbin "graphics/pokemon/poliwag/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_poliwag_icon:: @ 8D586A0
+gMonIcon_Poliwag:: @ 8D586A0
 	.incbin "graphics/pokemon/poliwag/icon.4bpp"
 
 	.align 2
@@ -4048,7 +4048,7 @@ gFile_graphics_pokemon_palettes_poliwhirl_shiny_palette:: @ 8D590E4
 	.incbin "graphics/pokemon/poliwhirl/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_poliwhirl_icon:: @ 8D5910C
+gMonIcon_Poliwhirl:: @ 8D5910C
 	.incbin "graphics/pokemon/poliwhirl/icon.4bpp"
 
 	.align 2
@@ -4072,7 +4072,7 @@ gFile_graphics_pokemon_palettes_poliwrath_shiny_palette:: @ 8D59C0C
 	.incbin "graphics/pokemon/poliwrath/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_poliwrath_icon:: @ 8D59C34
+gMonIcon_Poliwrath:: @ 8D59C34
 	.incbin "graphics/pokemon/poliwrath/icon.4bpp"
 
 	.align 2
@@ -4096,7 +4096,7 @@ gFile_graphics_pokemon_palettes_abra_shiny_palette:: @ 8D5A620
 	.incbin "graphics/pokemon/abra/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_abra_icon:: @ 8D5A644
+gMonIcon_Abra:: @ 8D5A644
 	.incbin "graphics/pokemon/abra/icon.4bpp"
 
 	.align 2
@@ -4120,7 +4120,7 @@ gFile_graphics_pokemon_palettes_kadabra_shiny_palette:: @ 8D5B300
 	.incbin "graphics/pokemon/kadabra/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_kadabra_icon:: @ 8D5B328
+gMonIcon_Kadabra:: @ 8D5B328
 	.incbin "graphics/pokemon/kadabra/icon.4bpp"
 
 	.align 2
@@ -4144,7 +4144,7 @@ gFile_graphics_pokemon_palettes_alakazam_shiny_palette:: @ 8D5BF88
 	.incbin "graphics/pokemon/alakazam/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_alakazam_icon:: @ 8D5BFB0
+gMonIcon_Alakazam:: @ 8D5BFB0
 	.incbin "graphics/pokemon/alakazam/icon.4bpp"
 
 	.align 2
@@ -4168,7 +4168,7 @@ gFile_graphics_pokemon_palettes_machop_shiny_palette:: @ 8D5C964
 	.incbin "graphics/pokemon/machop/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_machop_icon:: @ 8D5C98C
+gMonIcon_Machop:: @ 8D5C98C
 	.incbin "graphics/pokemon/machop/icon.4bpp"
 
 	.align 2
@@ -4192,7 +4192,7 @@ gFile_graphics_pokemon_palettes_machoke_shiny_palette:: @ 8D5D4F0
 	.incbin "graphics/pokemon/machoke/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_machoke_icon:: @ 8D5D518
+gMonIcon_Machoke:: @ 8D5D518
 	.incbin "graphics/pokemon/machoke/icon.4bpp"
 
 	.align 2
@@ -4216,7 +4216,7 @@ gFile_graphics_pokemon_palettes_machamp_shiny_palette:: @ 8D5E2A8
 	.incbin "graphics/pokemon/machamp/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_machamp_icon:: @ 8D5E2D0
+gMonIcon_Machamp:: @ 8D5E2D0
 	.incbin "graphics/pokemon/machamp/icon.4bpp"
 
 	.align 2
@@ -4240,7 +4240,7 @@ gFile_graphics_pokemon_palettes_bellsprout_shiny_palette:: @ 8D5EC40
 	.incbin "graphics/pokemon/bellsprout/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_bellsprout_icon:: @ 8D5EC68
+gMonIcon_Bellsprout:: @ 8D5EC68
 	.incbin "graphics/pokemon/bellsprout/icon.4bpp"
 
 	.align 2
@@ -4264,7 +4264,7 @@ gFile_graphics_pokemon_palettes_weepinbell_shiny_palette:: @ 8D5F6D0
 	.incbin "graphics/pokemon/weepinbell/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_weepinbell_icon:: @ 8D5F6F8
+gMonIcon_Weepinbell:: @ 8D5F6F8
 	.incbin "graphics/pokemon/weepinbell/icon.4bpp"
 
 	.align 2
@@ -4288,7 +4288,7 @@ gFile_graphics_pokemon_palettes_victreebel_shiny_palette:: @ 8D60304
 	.incbin "graphics/pokemon/victreebel/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_victreebel_icon:: @ 8D6032C
+gMonIcon_Victreebel:: @ 8D6032C
 	.incbin "graphics/pokemon/victreebel/icon.4bpp"
 
 	.align 2
@@ -4312,7 +4312,7 @@ gFile_graphics_pokemon_palettes_tentacool_shiny_palette:: @ 8D60CE8
 	.incbin "graphics/pokemon/tentacool/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_tentacool_icon:: @ 8D60D10
+gMonIcon_Tentacool:: @ 8D60D10
 	.incbin "graphics/pokemon/tentacool/icon.4bpp"
 
 	.align 2
@@ -4336,7 +4336,7 @@ gFile_graphics_pokemon_palettes_tentacruel_shiny_palette:: @ 8D619E8
 	.incbin "graphics/pokemon/tentacruel/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_tentacruel_icon:: @ 8D61A10
+gMonIcon_Tentacruel:: @ 8D61A10
 	.incbin "graphics/pokemon/tentacruel/icon.4bpp"
 
 	.align 2
@@ -4360,7 +4360,7 @@ gFile_graphics_pokemon_palettes_geodude_shiny_palette:: @ 8D62374
 	.incbin "graphics/pokemon/geodude/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_geodude_icon:: @ 8D62390
+gMonIcon_Geodude:: @ 8D62390
 	.incbin "graphics/pokemon/geodude/icon.4bpp"
 
 	.align 2
@@ -4384,7 +4384,7 @@ gFile_graphics_pokemon_palettes_graveler_shiny_palette:: @ 8D62E4C
 	.incbin "graphics/pokemon/graveler/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_graveler_icon:: @ 8D62E70
+gMonIcon_Graveler:: @ 8D62E70
 	.incbin "graphics/pokemon/graveler/icon.4bpp"
 
 	.align 2
@@ -4408,7 +4408,7 @@ gFile_graphics_pokemon_palettes_golem_shiny_palette:: @ 8D639A8
 	.incbin "graphics/pokemon/golem/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_golem_icon:: @ 8D639D0
+gMonIcon_Golem:: @ 8D639D0
 	.incbin "graphics/pokemon/golem/icon.4bpp"
 
 	.align 2
@@ -4432,7 +4432,7 @@ gFile_graphics_pokemon_palettes_ponyta_shiny_palette:: @ 8D644E4
 	.incbin "graphics/pokemon/ponyta/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_ponyta_icon:: @ 8D6450C
+gMonIcon_Ponyta:: @ 8D6450C
 	.incbin "graphics/pokemon/ponyta/icon.4bpp"
 
 	.align 2
@@ -4456,7 +4456,7 @@ gFile_graphics_pokemon_palettes_rapidash_shiny_palette:: @ 8D651EC
 	.incbin "graphics/pokemon/rapidash/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_rapidash_icon:: @ 8D65214
+gMonIcon_Rapidash:: @ 8D65214
 	.incbin "graphics/pokemon/rapidash/icon.4bpp"
 
 	.align 2
@@ -4480,7 +4480,7 @@ gFile_graphics_pokemon_palettes_slowpoke_shiny_palette:: @ 8D65B94
 	.incbin "graphics/pokemon/slowpoke/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_slowpoke_icon:: @ 8D65BBC
+gMonIcon_Slowpoke:: @ 8D65BBC
 	.incbin "graphics/pokemon/slowpoke/icon.4bpp"
 
 	.align 2
@@ -4504,7 +4504,7 @@ gFile_graphics_pokemon_palettes_slowbro_shiny_palette:: @ 8D66840
 	.incbin "graphics/pokemon/slowbro/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_slowbro_icon:: @ 8D66868
+gMonIcon_Slowbro:: @ 8D66868
 	.incbin "graphics/pokemon/slowbro/icon.4bpp"
 
 	.align 2
@@ -4528,7 +4528,7 @@ gFile_graphics_pokemon_palettes_magnemite_shiny_palette:: @ 8D67070
 	.incbin "graphics/pokemon/magnemite/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_magnemite_icon:: @ 8D67094
+gMonIcon_Magnemite:: @ 8D67094
 	.incbin "graphics/pokemon/magnemite/icon.4bpp"
 
 	.align 2
@@ -4552,7 +4552,7 @@ gFile_graphics_pokemon_palettes_magneton_shiny_palette:: @ 8D67B98
 	.incbin "graphics/pokemon/magneton/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_magneton_icon:: @ 8D67BC0
+gMonIcon_Magneton:: @ 8D67BC0
 	.incbin "graphics/pokemon/magneton/icon.4bpp"
 
 	.align 2
@@ -4576,7 +4576,7 @@ gFile_graphics_pokemon_palettes_farfetch_d_shiny_palette:: @ 8D686C8
 	.incbin "graphics/pokemon/farfetch_d/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_farfetch_d_icon:: @ 8D686F0
+gMonIcon_Farfetch_d:: @ 8D686F0
 	.incbin "graphics/pokemon/farfetch_d/icon.4bpp"
 
 	.align 2
@@ -4600,7 +4600,7 @@ gFile_graphics_pokemon_palettes_doduo_shiny_palette:: @ 8D69138
 	.incbin "graphics/pokemon/doduo/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_doduo_icon:: @ 8D6915C
+gMonIcon_Doduo:: @ 8D6915C
 	.incbin "graphics/pokemon/doduo/icon.4bpp"
 
 	.align 2
@@ -4624,7 +4624,7 @@ gFile_graphics_pokemon_palettes_dodrio_shiny_palette:: @ 8D69E48
 	.incbin "graphics/pokemon/dodrio/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_dodrio_icon:: @ 8D69E70
+gMonIcon_Dodrio:: @ 8D69E70
 	.incbin "graphics/pokemon/dodrio/icon.4bpp"
 
 	.align 2
@@ -4648,7 +4648,7 @@ gFile_graphics_pokemon_palettes_seel_shiny_palette:: @ 8D6A8C8
 	.incbin "graphics/pokemon/seel/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_seel_icon:: @ 8D6A8F0
+gMonIcon_Seel:: @ 8D6A8F0
 	.incbin "graphics/pokemon/seel/icon.4bpp"
 
 	.align 2
@@ -4672,7 +4672,7 @@ gFile_graphics_pokemon_palettes_dewgong_shiny_palette:: @ 8D6B398
 	.incbin "graphics/pokemon/dewgong/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_dewgong_icon:: @ 8D6B3BC
+gMonIcon_Dewgong:: @ 8D6B3BC
 	.incbin "graphics/pokemon/dewgong/icon.4bpp"
 
 	.align 2
@@ -4696,7 +4696,7 @@ gFile_graphics_pokemon_palettes_grimer_shiny_palette:: @ 8D6BDEC
 	.incbin "graphics/pokemon/grimer/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_grimer_icon:: @ 8D6BE10
+gMonIcon_Grimer:: @ 8D6BE10
 	.incbin "graphics/pokemon/grimer/icon.4bpp"
 
 	.align 2
@@ -4720,7 +4720,7 @@ gFile_graphics_pokemon_palettes_muk_shiny_palette:: @ 8D6C8DC
 	.incbin "graphics/pokemon/muk/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_muk_icon:: @ 8D6C900
+gMonIcon_Muk:: @ 8D6C900
 	.incbin "graphics/pokemon/muk/icon.4bpp"
 
 	.align 2
@@ -4744,7 +4744,7 @@ gFile_graphics_pokemon_palettes_shellder_shiny_palette:: @ 8D6D2CC
 	.incbin "graphics/pokemon/shellder/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_shellder_icon:: @ 8D6D2F0
+gMonIcon_Shellder:: @ 8D6D2F0
 	.incbin "graphics/pokemon/shellder/icon.4bpp"
 
 	.align 2
@@ -4768,7 +4768,7 @@ gFile_graphics_pokemon_palettes_cloyster_shiny_palette:: @ 8D6DF7C
 	.incbin "graphics/pokemon/cloyster/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_cloyster_icon:: @ 8D6DFA0
+gMonIcon_Cloyster:: @ 8D6DFA0
 	.incbin "graphics/pokemon/cloyster/icon.4bpp"
 
 	.align 2
@@ -4792,7 +4792,7 @@ gFile_graphics_pokemon_palettes_gastly_shiny_palette:: @ 8D6EAC4
 	.incbin "graphics/pokemon/gastly/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_gastly_icon:: @ 8D6EAEC
+gMonIcon_Gastly:: @ 8D6EAEC
 	.incbin "graphics/pokemon/gastly/icon.4bpp"
 
 	.align 2
@@ -4816,7 +4816,7 @@ gFile_graphics_pokemon_palettes_haunter_shiny_palette:: @ 8D6F5FC
 	.incbin "graphics/pokemon/haunter/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_haunter_icon:: @ 8D6F620
+gMonIcon_Haunter:: @ 8D6F620
 	.incbin "graphics/pokemon/haunter/icon.4bpp"
 
 	.align 2
@@ -4840,7 +4840,7 @@ gFile_graphics_pokemon_palettes_gengar_shiny_palette:: @ 8D70104
 	.incbin "graphics/pokemon/gengar/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_gengar_icon:: @ 8D70128
+gMonIcon_Gengar:: @ 8D70128
 	.incbin "graphics/pokemon/gengar/icon.4bpp"
 
 	.align 2
@@ -4864,7 +4864,7 @@ gFile_graphics_pokemon_palettes_onix_shiny_palette:: @ 8D70DB0
 	.incbin "graphics/pokemon/onix/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_onix_icon:: @ 8D70DCC
+gMonIcon_Onix:: @ 8D70DCC
 	.incbin "graphics/pokemon/onix/icon.4bpp"
 
 	.align 2
@@ -4888,7 +4888,7 @@ gFile_graphics_pokemon_palettes_drowzee_shiny_palette:: @ 8D7178C
 	.incbin "graphics/pokemon/drowzee/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_drowzee_icon:: @ 8D717B0
+gMonIcon_Drowzee:: @ 8D717B0
 	.incbin "graphics/pokemon/drowzee/icon.4bpp"
 
 	.align 2
@@ -4912,7 +4912,7 @@ gFile_graphics_pokemon_palettes_hypno_shiny_palette:: @ 8D7235C
 	.incbin "graphics/pokemon/hypno/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_hypno_icon:: @ 8D72380
+gMonIcon_Hypno:: @ 8D72380
 	.incbin "graphics/pokemon/hypno/icon.4bpp"
 
 	.align 2
@@ -4936,7 +4936,7 @@ gFile_graphics_pokemon_palettes_krabby_shiny_palette:: @ 8D72E78
 	.incbin "graphics/pokemon/krabby/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_krabby_icon:: @ 8D72EA0
+gMonIcon_Krabby:: @ 8D72EA0
 	.incbin "graphics/pokemon/krabby/icon.4bpp"
 
 	.align 2
@@ -4960,7 +4960,7 @@ gFile_graphics_pokemon_palettes_kingler_shiny_palette:: @ 8D73AEC
 	.incbin "graphics/pokemon/kingler/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_kingler_icon:: @ 8D73B14
+gMonIcon_Kingler:: @ 8D73B14
 	.incbin "graphics/pokemon/kingler/icon.4bpp"
 
 	.align 2
@@ -4984,7 +4984,7 @@ gFile_graphics_pokemon_palettes_voltorb_shiny_palette:: @ 8D743D4
 	.incbin "graphics/pokemon/voltorb/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_voltorb_icon:: @ 8D743F8
+gMonIcon_Voltorb:: @ 8D743F8
 	.incbin "graphics/pokemon/voltorb/icon.4bpp"
 
 	.align 2
@@ -5008,7 +5008,7 @@ gFile_graphics_pokemon_palettes_electrode_shiny_palette:: @ 8D74D18
 	.incbin "graphics/pokemon/electrode/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_electrode_icon:: @ 8D74D3C
+gMonIcon_Electrode:: @ 8D74D3C
 	.incbin "graphics/pokemon/electrode/icon.4bpp"
 
 	.align 2
@@ -5032,7 +5032,7 @@ gFile_graphics_pokemon_palettes_exeggcute_shiny_palette:: @ 8D75818
 	.incbin "graphics/pokemon/exeggcute/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_exeggcute_icon:: @ 8D7583C
+gMonIcon_Exeggcute:: @ 8D7583C
 	.incbin "graphics/pokemon/exeggcute/icon.4bpp"
 
 	.align 2
@@ -5056,7 +5056,7 @@ gFile_graphics_pokemon_palettes_exeggutor_shiny_palette:: @ 8D764A0
 	.incbin "graphics/pokemon/exeggutor/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_exeggutor_icon:: @ 8D764C8
+gMonIcon_Exeggutor:: @ 8D764C8
 	.incbin "graphics/pokemon/exeggutor/icon.4bpp"
 
 	.align 2
@@ -5080,7 +5080,7 @@ gFile_graphics_pokemon_palettes_cubone_shiny_palette:: @ 8D76F0C
 	.incbin "graphics/pokemon/cubone/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_cubone_icon:: @ 8D76F34
+gMonIcon_Cubone:: @ 8D76F34
 	.incbin "graphics/pokemon/cubone/icon.4bpp"
 
 	.align 2
@@ -5104,7 +5104,7 @@ gFile_graphics_pokemon_palettes_marowak_shiny_palette:: @ 8D77A10
 	.incbin "graphics/pokemon/marowak/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_marowak_icon:: @ 8D77A38
+gMonIcon_Marowak:: @ 8D77A38
 	.incbin "graphics/pokemon/marowak/icon.4bpp"
 
 	.align 2
@@ -5128,7 +5128,7 @@ gFile_graphics_pokemon_palettes_hitmonlee_shiny_palette:: @ 8D78498
 	.incbin "graphics/pokemon/hitmonlee/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_hitmonlee_icon:: @ 8D784C0
+gMonIcon_Hitmonlee:: @ 8D784C0
 	.incbin "graphics/pokemon/hitmonlee/icon.4bpp"
 
 	.align 2
@@ -5152,7 +5152,7 @@ gFile_graphics_pokemon_palettes_hitmonchan_shiny_palette:: @ 8D78F8C
 	.incbin "graphics/pokemon/hitmonchan/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_hitmonchan_icon:: @ 8D78FB4
+gMonIcon_Hitmonchan:: @ 8D78FB4
 	.incbin "graphics/pokemon/hitmonchan/icon.4bpp"
 
 	.align 2
@@ -5176,7 +5176,7 @@ gFile_graphics_pokemon_palettes_lickitung_shiny_palette:: @ 8D79A78
 	.incbin "graphics/pokemon/lickitung/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_lickitung_icon:: @ 8D79AA0
+gMonIcon_Lickitung:: @ 8D79AA0
 	.incbin "graphics/pokemon/lickitung/icon.4bpp"
 
 	.align 2
@@ -5200,7 +5200,7 @@ gFile_graphics_pokemon_palettes_koffing_shiny_palette:: @ 8D7A4E8
 	.incbin "graphics/pokemon/koffing/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_koffing_icon:: @ 8D7A510
+gMonIcon_Koffing:: @ 8D7A510
 	.incbin "graphics/pokemon/koffing/icon.4bpp"
 
 	.align 2
@@ -5224,7 +5224,7 @@ gFile_graphics_pokemon_palettes_weezing_shiny_palette:: @ 8D7B198
 	.incbin "graphics/pokemon/weezing/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_weezing_icon:: @ 8D7B1C0
+gMonIcon_Weezing:: @ 8D7B1C0
 	.incbin "graphics/pokemon/weezing/icon.4bpp"
 
 	.align 2
@@ -5248,7 +5248,7 @@ gFile_graphics_pokemon_palettes_rhyhorn_shiny_palette:: @ 8D7BD44
 	.incbin "graphics/pokemon/rhyhorn/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_rhyhorn_icon:: @ 8D7BD64
+gMonIcon_Rhyhorn:: @ 8D7BD64
 	.incbin "graphics/pokemon/rhyhorn/icon.4bpp"
 
 	.align 2
@@ -5272,7 +5272,7 @@ gFile_graphics_pokemon_palettes_rhydon_shiny_palette:: @ 8D7CAF0
 	.incbin "graphics/pokemon/rhydon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_rhydon_icon:: @ 8D7CB18
+gMonIcon_Rhydon:: @ 8D7CB18
 	.incbin "graphics/pokemon/rhydon/icon.4bpp"
 
 	.align 2
@@ -5296,7 +5296,7 @@ gFile_graphics_pokemon_palettes_chansey_shiny_palette:: @ 8D7D4E8
 	.incbin "graphics/pokemon/chansey/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_chansey_icon:: @ 8D7D50C
+gMonIcon_Chansey:: @ 8D7D50C
 	.incbin "graphics/pokemon/chansey/icon.4bpp"
 
 	.align 2
@@ -5320,7 +5320,7 @@ gFile_graphics_pokemon_palettes_tangela_shiny_palette:: @ 8D7E0D0
 	.incbin "graphics/pokemon/tangela/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_tangela_icon:: @ 8D7E0F4
+gMonIcon_Tangela:: @ 8D7E0F4
 	.incbin "graphics/pokemon/tangela/icon.4bpp"
 
 	.align 2
@@ -5344,7 +5344,7 @@ gFile_graphics_pokemon_palettes_kangaskhan_shiny_palette:: @ 8D7EE14
 	.incbin "graphics/pokemon/kangaskhan/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_kangaskhan_icon:: @ 8D7EE3C
+gMonIcon_Kangaskhan:: @ 8D7EE3C
 	.incbin "graphics/pokemon/kangaskhan/icon.4bpp"
 
 	.align 2
@@ -5368,7 +5368,7 @@ gFile_graphics_pokemon_palettes_horsea_shiny_palette:: @ 8D7F7D0
 	.incbin "graphics/pokemon/horsea/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_horsea_icon:: @ 8D7F7F8
+gMonIcon_Horsea:: @ 8D7F7F8
 	.incbin "graphics/pokemon/horsea/icon.4bpp"
 
 	.align 2
@@ -5392,7 +5392,7 @@ gFile_graphics_pokemon_palettes_seadra_shiny_palette:: @ 8D80368
 	.incbin "graphics/pokemon/seadra/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_seadra_icon:: @ 8D80390
+gMonIcon_Seadra:: @ 8D80390
 	.incbin "graphics/pokemon/seadra/icon.4bpp"
 
 	.align 2
@@ -5416,7 +5416,7 @@ gFile_graphics_pokemon_palettes_goldeen_shiny_palette:: @ 8D80EB0
 	.incbin "graphics/pokemon/goldeen/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_goldeen_icon:: @ 8D80ED8
+gMonIcon_Goldeen:: @ 8D80ED8
 	.incbin "graphics/pokemon/goldeen/icon.4bpp"
 
 	.align 2
@@ -5440,7 +5440,7 @@ gFile_graphics_pokemon_palettes_seaking_shiny_palette:: @ 8D81AE4
 	.incbin "graphics/pokemon/seaking/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_seaking_icon:: @ 8D81B0C
+gMonIcon_Seaking:: @ 8D81B0C
 	.incbin "graphics/pokemon/seaking/icon.4bpp"
 
 	.align 2
@@ -5464,7 +5464,7 @@ gFile_graphics_pokemon_palettes_staryu_shiny_palette:: @ 8D8246C
 	.incbin "graphics/pokemon/staryu/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_staryu_icon:: @ 8D82494
+gMonIcon_Staryu:: @ 8D82494
 	.incbin "graphics/pokemon/staryu/icon.4bpp"
 
 	.align 2
@@ -5488,7 +5488,7 @@ gFile_graphics_pokemon_palettes_starmie_shiny_palette:: @ 8D82F20
 	.incbin "graphics/pokemon/starmie/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_starmie_icon:: @ 8D82F48
+gMonIcon_Starmie:: @ 8D82F48
 	.incbin "graphics/pokemon/starmie/icon.4bpp"
 
 	.align 2
@@ -5512,7 +5512,7 @@ gFile_graphics_pokemon_palettes_mr_mime_shiny_palette:: @ 8D83A80
 	.incbin "graphics/pokemon/mr_mime/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_mr_mime_icon:: @ 8D83AA8
+gMonIcon_Mr_Mime:: @ 8D83AA8
 	.incbin "graphics/pokemon/mr_mime/icon.4bpp"
 
 	.align 2
@@ -5536,7 +5536,7 @@ gFile_graphics_pokemon_palettes_scyther_shiny_palette:: @ 8D84730
 	.incbin "graphics/pokemon/scyther/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_scyther_icon:: @ 8D84758
+gMonIcon_Scyther:: @ 8D84758
 	.incbin "graphics/pokemon/scyther/icon.4bpp"
 
 	.align 2
@@ -5560,7 +5560,7 @@ gFile_graphics_pokemon_palettes_jynx_shiny_palette:: @ 8D85258
 	.incbin "graphics/pokemon/jynx/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_jynx_icon:: @ 8D85280
+gMonIcon_Jynx:: @ 8D85280
 	.incbin "graphics/pokemon/jynx/icon.4bpp"
 
 	.align 2
@@ -5584,7 +5584,7 @@ gFile_graphics_pokemon_palettes_electabuzz_shiny_palette:: @ 8D85E30
 	.incbin "graphics/pokemon/electabuzz/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_electabuzz_icon:: @ 8D85E58
+gMonIcon_Electabuzz:: @ 8D85E58
 	.incbin "graphics/pokemon/electabuzz/icon.4bpp"
 
 	.align 2
@@ -5608,7 +5608,7 @@ gFile_graphics_pokemon_palettes_magmar_shiny_palette:: @ 8D86A08
 	.incbin "graphics/pokemon/magmar/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_magmar_icon:: @ 8D86A30
+gMonIcon_Magmar:: @ 8D86A30
 	.incbin "graphics/pokemon/magmar/icon.4bpp"
 
 	.align 2
@@ -5632,7 +5632,7 @@ gFile_graphics_pokemon_palettes_pinsir_shiny_palette:: @ 8D875F8
 	.incbin "graphics/pokemon/pinsir/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_pinsir_icon:: @ 8D8761C
+gMonIcon_Pinsir:: @ 8D8761C
 	.incbin "graphics/pokemon/pinsir/icon.4bpp"
 
 	.align 2
@@ -5656,7 +5656,7 @@ gFile_graphics_pokemon_palettes_tauros_shiny_palette:: @ 8D88178
 	.incbin "graphics/pokemon/tauros/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_tauros_icon:: @ 8D881A0
+gMonIcon_Tauros:: @ 8D881A0
 	.incbin "graphics/pokemon/tauros/icon.4bpp"
 
 	.align 2
@@ -5680,7 +5680,7 @@ gFile_graphics_pokemon_palettes_magikarp_shiny_palette:: @ 8D88C60
 	.incbin "graphics/pokemon/magikarp/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_magikarp_icon:: @ 8D88C88
+gMonIcon_Magikarp:: @ 8D88C88
 	.incbin "graphics/pokemon/magikarp/icon.4bpp"
 
 	.align 2
@@ -5704,7 +5704,7 @@ gFile_graphics_pokemon_palettes_gyarados_shiny_palette:: @ 8D89B2C
 	.incbin "graphics/pokemon/gyarados/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_gyarados_icon:: @ 8D89B54
+gMonIcon_Gyarados:: @ 8D89B54
 	.incbin "graphics/pokemon/gyarados/icon.4bpp"
 
 	.align 2
@@ -5728,7 +5728,7 @@ gFile_graphics_pokemon_palettes_lapras_shiny_palette:: @ 8D8A6C0
 	.incbin "graphics/pokemon/lapras/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_lapras_icon:: @ 8D8A6E8
+gMonIcon_Lapras:: @ 8D8A6E8
 	.incbin "graphics/pokemon/lapras/icon.4bpp"
 
 	.align 2
@@ -5752,7 +5752,7 @@ gFile_graphics_pokemon_palettes_ditto_shiny_palette:: @ 8D8AF18
 	.incbin "graphics/pokemon/ditto/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_ditto_icon:: @ 8D8AF38
+gMonIcon_Ditto:: @ 8D8AF38
 	.incbin "graphics/pokemon/ditto/icon.4bpp"
 
 	.align 2
@@ -5776,7 +5776,7 @@ gFile_graphics_pokemon_palettes_eevee_shiny_palette:: @ 8D8B994
 	.incbin "graphics/pokemon/eevee/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_eevee_icon:: @ 8D8B9BC
+gMonIcon_Eevee:: @ 8D8B9BC
 	.incbin "graphics/pokemon/eevee/icon.4bpp"
 
 	.align 2
@@ -5800,7 +5800,7 @@ gFile_graphics_pokemon_palettes_vaporeon_shiny_palette:: @ 8D8C460
 	.incbin "graphics/pokemon/vaporeon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_vaporeon_icon:: @ 8D8C488
+gMonIcon_Vaporeon:: @ 8D8C488
 	.incbin "graphics/pokemon/vaporeon/icon.4bpp"
 
 	.align 2
@@ -5824,7 +5824,7 @@ gFile_graphics_pokemon_palettes_jolteon_shiny_palette:: @ 8D8CFCC
 	.incbin "graphics/pokemon/jolteon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_jolteon_icon:: @ 8D8CFF4
+gMonIcon_Jolteon:: @ 8D8CFF4
 	.incbin "graphics/pokemon/jolteon/icon.4bpp"
 
 	.align 2
@@ -5848,7 +5848,7 @@ gFile_graphics_pokemon_palettes_flareon_shiny_palette:: @ 8D8DB50
 	.incbin "graphics/pokemon/flareon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_flareon_icon:: @ 8D8DB78
+gMonIcon_Flareon:: @ 8D8DB78
 	.incbin "graphics/pokemon/flareon/icon.4bpp"
 
 	.align 2
@@ -5872,7 +5872,7 @@ gFile_graphics_pokemon_palettes_porygon_shiny_palette:: @ 8D8E52C
 	.incbin "graphics/pokemon/porygon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_porygon_icon:: @ 8D8E550
+gMonIcon_Porygon:: @ 8D8E550
 	.incbin "graphics/pokemon/porygon/icon.4bpp"
 
 	.align 2
@@ -5896,7 +5896,7 @@ gFile_graphics_pokemon_palettes_omanyte_shiny_palette:: @ 8D8EF74
 	.incbin "graphics/pokemon/omanyte/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_omanyte_icon:: @ 8D8EF9C
+gMonIcon_Omanyte:: @ 8D8EF9C
 	.incbin "graphics/pokemon/omanyte/icon.4bpp"
 
 	.align 2
@@ -5920,7 +5920,7 @@ gFile_graphics_pokemon_palettes_omastar_shiny_palette:: @ 8D8FAE4
 	.incbin "graphics/pokemon/omastar/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_omastar_icon:: @ 8D8FB0C
+gMonIcon_Omastar:: @ 8D8FB0C
 	.incbin "graphics/pokemon/omastar/icon.4bpp"
 
 	.align 2
@@ -5944,7 +5944,7 @@ gFile_graphics_pokemon_palettes_kabuto_shiny_palette:: @ 8D90414
 	.incbin "graphics/pokemon/kabuto/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_kabuto_icon:: @ 8D9043C
+gMonIcon_Kabuto:: @ 8D9043C
 	.incbin "graphics/pokemon/kabuto/icon.4bpp"
 
 	.align 2
@@ -5968,7 +5968,7 @@ gFile_graphics_pokemon_palettes_kabutops_shiny_palette:: @ 8D91034
 	.incbin "graphics/pokemon/kabutops/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_kabutops_icon:: @ 8D91058
+gMonIcon_Kabutops:: @ 8D91058
 	.incbin "graphics/pokemon/kabutops/icon.4bpp"
 
 	.align 2
@@ -5992,7 +5992,7 @@ gFile_graphics_pokemon_palettes_aerodactyl_shiny_palette:: @ 8D91BF4
 	.incbin "graphics/pokemon/aerodactyl/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_aerodactyl_icon:: @ 8D91C1C
+gMonIcon_Aerodactyl:: @ 8D91C1C
 	.incbin "graphics/pokemon/aerodactyl/icon.4bpp"
 
 	.align 2
@@ -6016,7 +6016,7 @@ gFile_graphics_pokemon_palettes_snorlax_shiny_palette:: @ 8D92654
 	.incbin "graphics/pokemon/snorlax/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_snorlax_icon:: @ 8D9267C
+gMonIcon_Snorlax:: @ 8D9267C
 	.incbin "graphics/pokemon/snorlax/icon.4bpp"
 
 	.align 2
@@ -6040,7 +6040,7 @@ gFile_graphics_pokemon_palettes_articuno_shiny_palette:: @ 8D93218
 	.incbin "graphics/pokemon/articuno/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_articuno_icon:: @ 8D93240
+gMonIcon_Articuno:: @ 8D93240
 	.incbin "graphics/pokemon/articuno/icon.4bpp"
 
 	.align 2
@@ -6064,7 +6064,7 @@ gFile_graphics_pokemon_palettes_zapdos_shiny_palette:: @ 8D93E14
 	.incbin "graphics/pokemon/zapdos/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_zapdos_icon:: @ 8D93E3C
+gMonIcon_Zapdos:: @ 8D93E3C
 	.incbin "graphics/pokemon/zapdos/icon.4bpp"
 
 	.align 2
@@ -6088,7 +6088,7 @@ gFile_graphics_pokemon_palettes_moltres_shiny_palette:: @ 8D94A8C
 	.incbin "graphics/pokemon/moltres/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_moltres_icon:: @ 8D94AB4
+gMonIcon_Moltres:: @ 8D94AB4
 	.incbin "graphics/pokemon/moltres/icon.4bpp"
 
 	.align 2
@@ -6112,7 +6112,7 @@ gFile_graphics_pokemon_palettes_dratini_shiny_palette:: @ 8D95444
 	.incbin "graphics/pokemon/dratini/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_dratini_icon:: @ 8D95468
+gMonIcon_Dratini:: @ 8D95468
 	.incbin "graphics/pokemon/dratini/icon.4bpp"
 
 	.align 2
@@ -6136,7 +6136,7 @@ gFile_graphics_pokemon_palettes_dragonair_shiny_palette:: @ 8D95F58
 	.incbin "graphics/pokemon/dragonair/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_dragonair_icon:: @ 8D95F80
+gMonIcon_Dragonair:: @ 8D95F80
 	.incbin "graphics/pokemon/dragonair/icon.4bpp"
 
 	.align 2
@@ -6160,7 +6160,7 @@ gFile_graphics_pokemon_palettes_dragonite_shiny_palette:: @ 8D96C10
 	.incbin "graphics/pokemon/dragonite/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_dragonite_icon:: @ 8D96C38
+gMonIcon_Dragonite:: @ 8D96C38
 	.incbin "graphics/pokemon/dragonite/icon.4bpp"
 
 	.align 2
@@ -6184,7 +6184,7 @@ gFile_graphics_pokemon_palettes_mewtwo_shiny_palette:: @ 8D97884
 	.incbin "graphics/pokemon/mewtwo/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_mewtwo_icon:: @ 8D978A8
+gMonIcon_Mewtwo:: @ 8D978A8
 	.incbin "graphics/pokemon/mewtwo/icon.4bpp"
 
 	.align 2
@@ -6208,7 +6208,7 @@ gFile_graphics_pokemon_palettes_mew_shiny_palette:: @ 8D982FC
 	.incbin "graphics/pokemon/mew/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_mew_icon:: @ 8D98320
+gMonIcon_Mew:: @ 8D98320
 	.incbin "graphics/pokemon/mew/icon.4bpp"
 
 	.align 2
@@ -6232,7 +6232,7 @@ gFile_graphics_pokemon_palettes_chikorita_shiny_palette:: @ 8D98C94
 	.incbin "graphics/pokemon/chikorita/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_chikorita_icon:: @ 8D98CBC
+gMonIcon_Chikorita:: @ 8D98CBC
 	.incbin "graphics/pokemon/chikorita/icon.4bpp"
 
 	.align 2
@@ -6256,7 +6256,7 @@ gFile_graphics_pokemon_palettes_bayleef_shiny_palette:: @ 8D99868
 	.incbin "graphics/pokemon/bayleef/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_bayleef_icon:: @ 8D99890
+gMonIcon_Bayleef:: @ 8D99890
 	.incbin "graphics/pokemon/bayleef/icon.4bpp"
 
 	.align 2
@@ -6280,7 +6280,7 @@ gFile_graphics_pokemon_palettes_meganium_shiny_palette:: @ 8D9A584
 	.incbin "graphics/pokemon/meganium/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_meganium_icon:: @ 8D9A5AC
+gMonIcon_Meganium:: @ 8D9A5AC
 	.incbin "graphics/pokemon/meganium/icon.4bpp"
 
 	.align 2
@@ -6304,7 +6304,7 @@ gFile_graphics_pokemon_palettes_cyndaquil_shiny_palette:: @ 8D9AFAC
 	.incbin "graphics/pokemon/cyndaquil/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_cyndaquil_icon:: @ 8D9AFD4
+gMonIcon_Cyndaquil:: @ 8D9AFD4
 	.incbin "graphics/pokemon/cyndaquil/icon.4bpp"
 
 	.align 2
@@ -6328,7 +6328,7 @@ gFile_graphics_pokemon_palettes_quilava_shiny_palette:: @ 8D9BAAC
 	.incbin "graphics/pokemon/quilava/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_quilava_icon:: @ 8D9BAD4
+gMonIcon_Quilava:: @ 8D9BAD4
 	.incbin "graphics/pokemon/quilava/icon.4bpp"
 
 	.align 2
@@ -6352,7 +6352,7 @@ gFile_graphics_pokemon_palettes_typhlosion_shiny_palette:: @ 8D9C748
 	.incbin "graphics/pokemon/typhlosion/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_typhlosion_icon:: @ 8D9C770
+gMonIcon_Typhlosion:: @ 8D9C770
 	.incbin "graphics/pokemon/typhlosion/icon.4bpp"
 
 	.align 2
@@ -6376,7 +6376,7 @@ gFile_graphics_pokemon_palettes_totodile_shiny_palette:: @ 8D9D13C
 	.incbin "graphics/pokemon/totodile/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_totodile_icon:: @ 8D9D164
+gMonIcon_Totodile:: @ 8D9D164
 	.incbin "graphics/pokemon/totodile/icon.4bpp"
 
 	.align 2
@@ -6400,7 +6400,7 @@ gFile_graphics_pokemon_palettes_croconaw_shiny_palette:: @ 8D9DC64
 	.incbin "graphics/pokemon/croconaw/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_croconaw_icon:: @ 8D9DC8C
+gMonIcon_Croconaw:: @ 8D9DC8C
 	.incbin "graphics/pokemon/croconaw/icon.4bpp"
 
 	.align 2
@@ -6424,7 +6424,7 @@ gFile_graphics_pokemon_palettes_feraligatr_shiny_palette:: @ 8D9EB0C
 	.incbin "graphics/pokemon/feraligatr/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_feraligatr_icon:: @ 8D9EB34
+gMonIcon_Feraligatr:: @ 8D9EB34
 	.incbin "graphics/pokemon/feraligatr/icon.4bpp"
 
 	.align 2
@@ -6448,7 +6448,7 @@ gFile_graphics_pokemon_palettes_sentret_shiny_palette:: @ 8D9F4FC
 	.incbin "graphics/pokemon/sentret/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_sentret_icon:: @ 8D9F524
+gMonIcon_Sentret:: @ 8D9F524
 	.incbin "graphics/pokemon/sentret/icon.4bpp"
 
 	.align 2
@@ -6472,7 +6472,7 @@ gFile_graphics_pokemon_palettes_furret_shiny_palette:: @ 8D9FFC8
 	.incbin "graphics/pokemon/furret/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_furret_icon:: @ 8D9FFF0
+gMonIcon_Furret:: @ 8D9FFF0
 	.incbin "graphics/pokemon/furret/icon.4bpp"
 
 	.align 2
@@ -6496,7 +6496,7 @@ gFile_graphics_pokemon_palettes_hoothoot_shiny_palette:: @ 8DA09C4
 	.incbin "graphics/pokemon/hoothoot/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_hoothoot_icon:: @ 8DA09EC
+gMonIcon_Hoothoot:: @ 8DA09EC
 	.incbin "graphics/pokemon/hoothoot/icon.4bpp"
 
 	.align 2
@@ -6520,7 +6520,7 @@ gFile_graphics_pokemon_palettes_noctowl_shiny_palette:: @ 8DA14E4
 	.incbin "graphics/pokemon/noctowl/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_noctowl_icon:: @ 8DA150C
+gMonIcon_Noctowl:: @ 8DA150C
 	.incbin "graphics/pokemon/noctowl/icon.4bpp"
 
 	.align 2
@@ -6544,7 +6544,7 @@ gFile_graphics_pokemon_palettes_ledyba_shiny_palette:: @ 8DA1F78
 	.incbin "graphics/pokemon/ledyba/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_ledyba_icon:: @ 8DA1FA0
+gMonIcon_Ledyba:: @ 8DA1FA0
 	.incbin "graphics/pokemon/ledyba/icon.4bpp"
 
 	.align 2
@@ -6568,7 +6568,7 @@ gFile_graphics_pokemon_palettes_ledian_shiny_palette:: @ 8DA2AC8
 	.incbin "graphics/pokemon/ledian/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_ledian_icon:: @ 8DA2AF0
+gMonIcon_Ledian:: @ 8DA2AF0
 	.incbin "graphics/pokemon/ledian/icon.4bpp"
 
 	.align 2
@@ -6592,7 +6592,7 @@ gFile_graphics_pokemon_palettes_spinarak_shiny_palette:: @ 8DA3410
 	.incbin "graphics/pokemon/spinarak/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_spinarak_icon:: @ 8DA3438
+gMonIcon_Spinarak:: @ 8DA3438
 	.incbin "graphics/pokemon/spinarak/icon.4bpp"
 
 	.align 2
@@ -6616,7 +6616,7 @@ gFile_graphics_pokemon_palettes_ariados_shiny_palette:: @ 8DA3FB8
 	.incbin "graphics/pokemon/ariados/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_ariados_icon:: @ 8DA3FE0
+gMonIcon_Ariados:: @ 8DA3FE0
 	.incbin "graphics/pokemon/ariados/icon.4bpp"
 
 	.align 2
@@ -6640,7 +6640,7 @@ gFile_graphics_pokemon_palettes_crobat_shiny_palette:: @ 8DA4AE0
 	.incbin "graphics/pokemon/crobat/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_crobat_icon:: @ 8DA4B08
+gMonIcon_Crobat:: @ 8DA4B08
 	.incbin "graphics/pokemon/crobat/icon.4bpp"
 
 	.align 2
@@ -6664,7 +6664,7 @@ gFile_graphics_pokemon_palettes_chinchou_shiny_palette:: @ 8DA5520
 	.incbin "graphics/pokemon/chinchou/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_chinchou_icon:: @ 8DA5548
+gMonIcon_Chinchou:: @ 8DA5548
 	.incbin "graphics/pokemon/chinchou/icon.4bpp"
 
 	.align 2
@@ -6688,7 +6688,7 @@ gFile_graphics_pokemon_palettes_lanturn_shiny_palette:: @ 8DA6000
 	.incbin "graphics/pokemon/lanturn/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_lanturn_icon:: @ 8DA6028
+gMonIcon_Lanturn:: @ 8DA6028
 	.incbin "graphics/pokemon/lanturn/icon.4bpp"
 
 	.align 2
@@ -6712,7 +6712,7 @@ gFile_graphics_pokemon_palettes_pichu_shiny_palette:: @ 8DA68E8
 	.incbin "graphics/pokemon/pichu/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_pichu_icon:: @ 8DA6910
+gMonIcon_Pichu:: @ 8DA6910
 	.incbin "graphics/pokemon/pichu/icon.4bpp"
 
 	.align 2
@@ -6736,7 +6736,7 @@ gFile_graphics_pokemon_palettes_cleffa_shiny_palette:: @ 8DA7174
 	.incbin "graphics/pokemon/cleffa/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_cleffa_icon:: @ 8DA719C
+gMonIcon_Cleffa:: @ 8DA719C
 	.incbin "graphics/pokemon/cleffa/icon.4bpp"
 
 	.align 2
@@ -6760,7 +6760,7 @@ gFile_graphics_pokemon_palettes_igglybuff_shiny_palette:: @ 8DA7A08
 	.incbin "graphics/pokemon/igglybuff/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_igglybuff_icon:: @ 8DA7A30
+gMonIcon_Igglybuff:: @ 8DA7A30
 	.incbin "graphics/pokemon/igglybuff/icon.4bpp"
 
 	.align 2
@@ -6784,7 +6784,7 @@ gFile_graphics_pokemon_palettes_togepi_shiny_palette:: @ 8DA82C0
 	.incbin "graphics/pokemon/togepi/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_togepi_icon:: @ 8DA82E8
+gMonIcon_Togepi:: @ 8DA82E8
 	.incbin "graphics/pokemon/togepi/icon.4bpp"
 
 	.align 2
@@ -6808,7 +6808,7 @@ gFile_graphics_pokemon_palettes_togetic_shiny_palette:: @ 8DA8CD0
 	.incbin "graphics/pokemon/togetic/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_togetic_icon:: @ 8DA8CF8
+gMonIcon_Togetic:: @ 8DA8CF8
 	.incbin "graphics/pokemon/togetic/icon.4bpp"
 
 	.align 2
@@ -6832,7 +6832,7 @@ gFile_graphics_pokemon_palettes_natu_shiny_palette:: @ 8DA9520
 	.incbin "graphics/pokemon/natu/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_natu_icon:: @ 8DA9548
+gMonIcon_Natu:: @ 8DA9548
 	.incbin "graphics/pokemon/natu/icon.4bpp"
 
 	.align 2
@@ -6856,7 +6856,7 @@ gFile_graphics_pokemon_palettes_xatu_shiny_palette:: @ 8DA9FE4
 	.incbin "graphics/pokemon/xatu/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_xatu_icon:: @ 8DAA00C
+gMonIcon_Xatu:: @ 8DAA00C
 	.incbin "graphics/pokemon/xatu/icon.4bpp"
 
 	.align 2
@@ -6880,7 +6880,7 @@ gFile_graphics_pokemon_palettes_mareep_shiny_palette:: @ 8DAA9FC
 	.incbin "graphics/pokemon/mareep/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_mareep_icon:: @ 8DAAA24
+gMonIcon_Mareep:: @ 8DAAA24
 	.incbin "graphics/pokemon/mareep/icon.4bpp"
 
 	.align 2
@@ -6904,7 +6904,7 @@ gFile_graphics_pokemon_palettes_flaaffy_shiny_palette:: @ 8DAB488
 	.incbin "graphics/pokemon/flaaffy/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_flaaffy_icon:: @ 8DAB4B0
+gMonIcon_Flaaffy:: @ 8DAB4B0
 	.incbin "graphics/pokemon/flaaffy/icon.4bpp"
 
 	.align 2
@@ -6928,7 +6928,7 @@ gFile_graphics_pokemon_palettes_ampharos_shiny_palette:: @ 8DABFCC
 	.incbin "graphics/pokemon/ampharos/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_ampharos_icon:: @ 8DABFF4
+gMonIcon_Ampharos:: @ 8DABFF4
 	.incbin "graphics/pokemon/ampharos/icon.4bpp"
 
 	.align 2
@@ -6952,7 +6952,7 @@ gFile_graphics_pokemon_palettes_bellossom_shiny_palette:: @ 8DAC9D0
 	.incbin "graphics/pokemon/bellossom/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_bellossom_icon:: @ 8DAC9F8
+gMonIcon_Bellossom:: @ 8DAC9F8
 	.incbin "graphics/pokemon/bellossom/icon.4bpp"
 
 	.align 2
@@ -6976,7 +6976,7 @@ gFile_graphics_pokemon_palettes_marill_shiny_palette:: @ 8DAD3B0
 	.incbin "graphics/pokemon/marill/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_marill_icon:: @ 8DAD3D8
+gMonIcon_Marill:: @ 8DAD3D8
 	.incbin "graphics/pokemon/marill/icon.4bpp"
 
 	.align 2
@@ -7000,7 +7000,7 @@ gFile_graphics_pokemon_palettes_azumarill_shiny_palette:: @ 8DADDDC
 	.incbin "graphics/pokemon/azumarill/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_azumarill_icon:: @ 8DADE04
+gMonIcon_Azumarill:: @ 8DADE04
 	.incbin "graphics/pokemon/azumarill/icon.4bpp"
 
 	.align 2
@@ -7024,7 +7024,7 @@ gFile_graphics_pokemon_palettes_sudowoodo_shiny_palette:: @ 8DAE8C0
 	.incbin "graphics/pokemon/sudowoodo/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_sudowoodo_icon:: @ 8DAE8E8
+gMonIcon_Sudowoodo:: @ 8DAE8E8
 	.incbin "graphics/pokemon/sudowoodo/icon.4bpp"
 
 	.align 2
@@ -7048,7 +7048,7 @@ gFile_graphics_pokemon_palettes_politoed_shiny_palette:: @ 8DAF328
 	.incbin "graphics/pokemon/politoed/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_politoed_icon:: @ 8DAF350
+gMonIcon_Politoed:: @ 8DAF350
 	.incbin "graphics/pokemon/politoed/icon.4bpp"
 
 	.align 2
@@ -7072,7 +7072,7 @@ gFile_graphics_pokemon_palettes_hoppip_shiny_palette:: @ 8DAFD2C
 	.incbin "graphics/pokemon/hoppip/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_hoppip_icon:: @ 8DAFD54
+gMonIcon_Hoppip:: @ 8DAFD54
 	.incbin "graphics/pokemon/hoppip/icon.4bpp"
 
 	.align 2
@@ -7096,7 +7096,7 @@ gFile_graphics_pokemon_palettes_skiploom_shiny_palette:: @ 8DB0704
 	.incbin "graphics/pokemon/skiploom/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_skiploom_icon:: @ 8DB072C
+gMonIcon_Skiploom:: @ 8DB072C
 	.incbin "graphics/pokemon/skiploom/icon.4bpp"
 
 	.align 2
@@ -7120,7 +7120,7 @@ gFile_graphics_pokemon_palettes_jumpluff_shiny_palette:: @ 8DB12D8
 	.incbin "graphics/pokemon/jumpluff/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_jumpluff_icon:: @ 8DB1300
+gMonIcon_Jumpluff:: @ 8DB1300
 	.incbin "graphics/pokemon/jumpluff/icon.4bpp"
 
 	.align 2
@@ -7144,7 +7144,7 @@ gFile_graphics_pokemon_palettes_aipom_shiny_palette:: @ 8DB1D38
 	.incbin "graphics/pokemon/aipom/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_aipom_icon:: @ 8DB1D60
+gMonIcon_Aipom:: @ 8DB1D60
 	.incbin "graphics/pokemon/aipom/icon.4bpp"
 
 	.align 2
@@ -7168,7 +7168,7 @@ gFile_graphics_pokemon_palettes_sunkern_shiny_palette:: @ 8DB26A4
 	.incbin "graphics/pokemon/sunkern/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_sunkern_icon:: @ 8DB26CC
+gMonIcon_Sunkern:: @ 8DB26CC
 	.incbin "graphics/pokemon/sunkern/icon.4bpp"
 
 	.align 2
@@ -7192,7 +7192,7 @@ gFile_graphics_pokemon_palettes_sunflora_shiny_palette:: @ 8DB320C
 	.incbin "graphics/pokemon/sunflora/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_sunflora_icon:: @ 8DB3234
+gMonIcon_Sunflora:: @ 8DB3234
 	.incbin "graphics/pokemon/sunflora/icon.4bpp"
 
 	.align 2
@@ -7216,7 +7216,7 @@ gFile_graphics_pokemon_palettes_yanma_shiny_palette:: @ 8DB3DB4
 	.incbin "graphics/pokemon/yanma/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_yanma_icon:: @ 8DB3DDC
+gMonIcon_Yanma:: @ 8DB3DDC
 	.incbin "graphics/pokemon/yanma/icon.4bpp"
 
 	.align 2
@@ -7240,7 +7240,7 @@ gFile_graphics_pokemon_palettes_wooper_shiny_palette:: @ 8DB46F0
 	.incbin "graphics/pokemon/wooper/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_wooper_icon:: @ 8DB4718
+gMonIcon_Wooper:: @ 8DB4718
 	.incbin "graphics/pokemon/wooper/icon.4bpp"
 
 	.align 2
@@ -7264,7 +7264,7 @@ gFile_graphics_pokemon_palettes_quagsire_shiny_palette:: @ 8DB51D0
 	.incbin "graphics/pokemon/quagsire/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_quagsire_icon:: @ 8DB51F8
+gMonIcon_Quagsire:: @ 8DB51F8
 	.incbin "graphics/pokemon/quagsire/icon.4bpp"
 
 	.align 2
@@ -7288,7 +7288,7 @@ gFile_graphics_pokemon_palettes_espeon_shiny_palette:: @ 8DB5C58
 	.incbin "graphics/pokemon/espeon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_espeon_icon:: @ 8DB5C7C
+gMonIcon_Espeon:: @ 8DB5C7C
 	.incbin "graphics/pokemon/espeon/icon.4bpp"
 
 	.align 2
@@ -7312,7 +7312,7 @@ gFile_graphics_pokemon_palettes_umbreon_shiny_palette:: @ 8DB66EC
 	.incbin "graphics/pokemon/umbreon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_umbreon_icon:: @ 8DB6714
+gMonIcon_Umbreon:: @ 8DB6714
 	.incbin "graphics/pokemon/umbreon/icon.4bpp"
 
 	.align 2
@@ -7336,7 +7336,7 @@ gFile_graphics_pokemon_palettes_murkrow_shiny_palette:: @ 8DB7154
 	.incbin "graphics/pokemon/murkrow/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_murkrow_icon:: @ 8DB717C
+gMonIcon_Murkrow:: @ 8DB717C
 	.incbin "graphics/pokemon/murkrow/icon.4bpp"
 
 	.align 2
@@ -7360,7 +7360,7 @@ gFile_graphics_pokemon_palettes_slowking_shiny_palette:: @ 8DB7D04
 	.incbin "graphics/pokemon/slowking/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_slowking_icon:: @ 8DB7D2C
+gMonIcon_Slowking:: @ 8DB7D2C
 	.incbin "graphics/pokemon/slowking/icon.4bpp"
 
 	.align 2
@@ -7384,7 +7384,7 @@ gFile_graphics_pokemon_palettes_misdreavus_shiny_palette:: @ 8DB8758
 	.incbin "graphics/pokemon/misdreavus/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_misdreavus_icon:: @ 8DB8780
+gMonIcon_Misdreavus:: @ 8DB8780
 	.incbin "graphics/pokemon/misdreavus/icon.4bpp"
 
 	.align 2
@@ -7408,7 +7408,7 @@ gFile_graphics_pokemon_palettes_unown_shiny_palette:: @ 8DB8F94
 	.incbin "graphics/pokemon/unown/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_a_icon:: @ 8DB8FB4
+gMonIcon_Unown_A:: @ 8DB8FB4
 	.incbin "graphics/pokemon/unown/a/icon.4bpp"
 
 	.align 2
@@ -7432,7 +7432,7 @@ gFile_graphics_pokemon_palettes_wobbuffet_shiny_palette:: @ 8DB9990
 	.incbin "graphics/pokemon/wobbuffet/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_wobbuffet_icon:: @ 8DB99B8
+gMonIcon_Wobbuffet:: @ 8DB99B8
 	.incbin "graphics/pokemon/wobbuffet/icon.4bpp"
 
 	.align 2
@@ -7456,7 +7456,7 @@ gFile_graphics_pokemon_palettes_girafarig_shiny_palette:: @ 8DBA5B0
 	.incbin "graphics/pokemon/girafarig/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_girafarig_icon:: @ 8DBA5D8
+gMonIcon_Girafarig:: @ 8DBA5D8
 	.incbin "graphics/pokemon/girafarig/icon.4bpp"
 
 	.align 2
@@ -7480,7 +7480,7 @@ gFile_graphics_pokemon_palettes_pineco_shiny_palette:: @ 8DBB034
 	.incbin "graphics/pokemon/pineco/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_pineco_icon:: @ 8DBB058
+gMonIcon_Pineco:: @ 8DBB058
 	.incbin "graphics/pokemon/pineco/icon.4bpp"
 
 	.align 2
@@ -7504,7 +7504,7 @@ gFile_graphics_pokemon_palettes_forretress_shiny_palette:: @ 8DBBB7C
 	.incbin "graphics/pokemon/forretress/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_forretress_icon:: @ 8DBBBA4
+gMonIcon_Forretress:: @ 8DBBBA4
 	.incbin "graphics/pokemon/forretress/icon.4bpp"
 
 	.align 2
@@ -7528,7 +7528,7 @@ gFile_graphics_pokemon_palettes_dunsparce_shiny_palette:: @ 8DBC5F8
 	.incbin "graphics/pokemon/dunsparce/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_dunsparce_icon:: @ 8DBC620
+gMonIcon_Dunsparce:: @ 8DBC620
 	.incbin "graphics/pokemon/dunsparce/icon.4bpp"
 
 	.align 2
@@ -7552,7 +7552,7 @@ gFile_graphics_pokemon_palettes_gligar_shiny_palette:: @ 8DBD268
 	.incbin "graphics/pokemon/gligar/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_gligar_icon:: @ 8DBD290
+gMonIcon_Gligar:: @ 8DBD290
 	.incbin "graphics/pokemon/gligar/icon.4bpp"
 
 	.align 2
@@ -7576,7 +7576,7 @@ gFile_graphics_pokemon_palettes_steelix_shiny_palette:: @ 8DBDFA8
 	.incbin "graphics/pokemon/steelix/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_steelix_icon:: @ 8DBDFCC
+gMonIcon_Steelix:: @ 8DBDFCC
 	.incbin "graphics/pokemon/steelix/icon.4bpp"
 
 	.align 2
@@ -7600,7 +7600,7 @@ gFile_graphics_pokemon_palettes_snubbull_shiny_palette:: @ 8DBEA10
 	.incbin "graphics/pokemon/snubbull/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_snubbull_icon:: @ 8DBEA38
+gMonIcon_Snubbull:: @ 8DBEA38
 	.incbin "graphics/pokemon/snubbull/icon.4bpp"
 
 	.align 2
@@ -7624,7 +7624,7 @@ gFile_graphics_pokemon_palettes_granbull_shiny_palette:: @ 8DBF530
 	.incbin "graphics/pokemon/granbull/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_granbull_icon:: @ 8DBF558
+gMonIcon_Granbull:: @ 8DBF558
 	.incbin "graphics/pokemon/granbull/icon.4bpp"
 
 	.align 2
@@ -7648,7 +7648,7 @@ gFile_graphics_pokemon_palettes_qwilfish_shiny_palette:: @ 8DBFF40
 	.incbin "graphics/pokemon/qwilfish/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_qwilfish_icon:: @ 8DBFF68
+gMonIcon_Qwilfish:: @ 8DBFF68
 	.incbin "graphics/pokemon/qwilfish/icon.4bpp"
 
 	.align 2
@@ -7672,7 +7672,7 @@ gFile_graphics_pokemon_palettes_scizor_shiny_palette:: @ 8DC0C18
 	.incbin "graphics/pokemon/scizor/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_scizor_icon:: @ 8DC0C40
+gMonIcon_Scizor:: @ 8DC0C40
 	.incbin "graphics/pokemon/scizor/icon.4bpp"
 
 	.align 2
@@ -7696,7 +7696,7 @@ gFile_graphics_pokemon_palettes_shuckle_shiny_palette:: @ 8DC15A8
 	.incbin "graphics/pokemon/shuckle/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_shuckle_icon:: @ 8DC15D0
+gMonIcon_Shuckle:: @ 8DC15D0
 	.incbin "graphics/pokemon/shuckle/icon.4bpp"
 
 	.align 2
@@ -7720,7 +7720,7 @@ gFile_graphics_pokemon_palettes_heracross_shiny_palette:: @ 8DC2178
 	.incbin "graphics/pokemon/heracross/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_heracross_icon:: @ 8DC21A0
+gMonIcon_Heracross:: @ 8DC21A0
 	.incbin "graphics/pokemon/heracross/icon.4bpp"
 
 gUnknown_heracross_icon:: @ 8DC25A0
@@ -7747,7 +7747,7 @@ gFile_graphics_pokemon_palettes_sneasel_shiny_palette:: @ 8DC3050
 	.incbin "graphics/pokemon/sneasel/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_sneasel_icon:: @ 8DC3078
+gMonIcon_Sneasel:: @ 8DC3078
 	.incbin "graphics/pokemon/sneasel/icon.4bpp"
 
 	.align 2
@@ -7771,7 +7771,7 @@ gFile_graphics_pokemon_palettes_teddiursa_shiny_palette:: @ 8DC39E0
 	.incbin "graphics/pokemon/teddiursa/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_teddiursa_icon:: @ 8DC3A08
+gMonIcon_Teddiursa:: @ 8DC3A08
 	.incbin "graphics/pokemon/teddiursa/icon.4bpp"
 
 	.align 2
@@ -7795,7 +7795,7 @@ gFile_graphics_pokemon_palettes_ursaring_shiny_palette:: @ 8DC4610
 	.incbin "graphics/pokemon/ursaring/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_ursaring_icon:: @ 8DC4638
+gMonIcon_Ursaring:: @ 8DC4638
 	.incbin "graphics/pokemon/ursaring/icon.4bpp"
 
 	.align 2
@@ -7819,7 +7819,7 @@ gFile_graphics_pokemon_palettes_slugma_shiny_palette:: @ 8DC4FD8
 	.incbin "graphics/pokemon/slugma/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_slugma_icon:: @ 8DC4FFC
+gMonIcon_Slugma:: @ 8DC4FFC
 	.incbin "graphics/pokemon/slugma/icon.4bpp"
 
 	.align 2
@@ -7843,7 +7843,7 @@ gFile_graphics_pokemon_palettes_magcargo_shiny_palette:: @ 8DC5BA4
 	.incbin "graphics/pokemon/magcargo/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_magcargo_icon:: @ 8DC5BCC
+gMonIcon_Magcargo:: @ 8DC5BCC
 	.incbin "graphics/pokemon/magcargo/icon.4bpp"
 
 	.align 2
@@ -7867,7 +7867,7 @@ gFile_graphics_pokemon_palettes_swinub_shiny_palette:: @ 8DC644C
 	.incbin "graphics/pokemon/swinub/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_swinub_icon:: @ 8DC6474
+gMonIcon_Swinub:: @ 8DC6474
 	.incbin "graphics/pokemon/swinub/icon.4bpp"
 
 	.align 2
@@ -7891,7 +7891,7 @@ gFile_graphics_pokemon_palettes_piloswine_shiny_palette:: @ 8DC6E30
 	.incbin "graphics/pokemon/piloswine/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_piloswine_icon:: @ 8DC6E58
+gMonIcon_Piloswine:: @ 8DC6E58
 	.incbin "graphics/pokemon/piloswine/icon.4bpp"
 
 	.align 2
@@ -7915,7 +7915,7 @@ gFile_graphics_pokemon_palettes_corsola_shiny_palette:: @ 8DC7848
 	.incbin "graphics/pokemon/corsola/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_corsola_icon:: @ 8DC7870
+gMonIcon_Corsola:: @ 8DC7870
 	.incbin "graphics/pokemon/corsola/icon.4bpp"
 
 	.align 2
@@ -7939,7 +7939,7 @@ gFile_graphics_pokemon_palettes_remoraid_shiny_palette:: @ 8DC8234
 	.incbin "graphics/pokemon/remoraid/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_remoraid_icon:: @ 8DC825C
+gMonIcon_Remoraid:: @ 8DC825C
 	.incbin "graphics/pokemon/remoraid/icon.4bpp"
 
 	.align 2
@@ -7963,7 +7963,7 @@ gFile_graphics_pokemon_palettes_octillery_shiny_palette:: @ 8DC8C90
 	.incbin "graphics/pokemon/octillery/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_octillery_icon:: @ 8DC8CB8
+gMonIcon_Octillery:: @ 8DC8CB8
 	.incbin "graphics/pokemon/octillery/icon.4bpp"
 
 	.align 2
@@ -7987,7 +7987,7 @@ gFile_graphics_pokemon_palettes_delibird_shiny_palette:: @ 8DC9830
 	.incbin "graphics/pokemon/delibird/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_delibird_icon:: @ 8DC9858
+gMonIcon_Delibird:: @ 8DC9858
 	.incbin "graphics/pokemon/delibird/icon.4bpp"
 
 	.align 2
@@ -8011,7 +8011,7 @@ gFile_graphics_pokemon_palettes_mantine_shiny_palette:: @ 8DCA3DC
 	.incbin "graphics/pokemon/mantine/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_mantine_icon:: @ 8DCA404
+gMonIcon_Mantine:: @ 8DCA404
 	.incbin "graphics/pokemon/mantine/icon.4bpp"
 
 	.align 2
@@ -8035,7 +8035,7 @@ gFile_graphics_pokemon_palettes_skarmory_shiny_palette:: @ 8DCB030
 	.incbin "graphics/pokemon/skarmory/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_skarmory_icon:: @ 8DCB058
+gMonIcon_Skarmory:: @ 8DCB058
 	.incbin "graphics/pokemon/skarmory/icon.4bpp"
 
 	.align 2
@@ -8059,7 +8059,7 @@ gFile_graphics_pokemon_palettes_houndour_shiny_palette:: @ 8DCB9D8
 	.incbin "graphics/pokemon/houndour/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_houndour_icon:: @ 8DCBA00
+gMonIcon_Houndour:: @ 8DCBA00
 	.incbin "graphics/pokemon/houndour/icon.4bpp"
 
 	.align 2
@@ -8083,7 +8083,7 @@ gFile_graphics_pokemon_palettes_houndoom_shiny_palette:: @ 8DCC56C
 	.incbin "graphics/pokemon/houndoom/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_houndoom_icon:: @ 8DCC594
+gMonIcon_Houndoom:: @ 8DCC594
 	.incbin "graphics/pokemon/houndoom/icon.4bpp"
 
 	.align 2
@@ -8107,7 +8107,7 @@ gFile_graphics_pokemon_palettes_kingdra_shiny_palette:: @ 8DCD1B0
 	.incbin "graphics/pokemon/kingdra/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_kingdra_icon:: @ 8DCD1D8
+gMonIcon_Kingdra:: @ 8DCD1D8
 	.incbin "graphics/pokemon/kingdra/icon.4bpp"
 
 	.align 2
@@ -8131,7 +8131,7 @@ gFile_graphics_pokemon_palettes_phanpy_shiny_palette:: @ 8DCDB40
 	.incbin "graphics/pokemon/phanpy/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_phanpy_icon:: @ 8DCDB68
+gMonIcon_Phanpy:: @ 8DCDB68
 	.incbin "graphics/pokemon/phanpy/icon.4bpp"
 
 	.align 2
@@ -8155,7 +8155,7 @@ gFile_graphics_pokemon_palettes_donphan_shiny_palette:: @ 8DCE720
 	.incbin "graphics/pokemon/donphan/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_donphan_icon:: @ 8DCE748
+gMonIcon_Donphan:: @ 8DCE748
 	.incbin "graphics/pokemon/donphan/icon.4bpp"
 
 	.align 2
@@ -8179,7 +8179,7 @@ gFile_graphics_pokemon_palettes_porygon2_shiny_palette:: @ 8DCF134
 	.incbin "graphics/pokemon/porygon2/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_porygon2_icon:: @ 8DCF15C
+gMonIcon_Porygon2:: @ 8DCF15C
 	.incbin "graphics/pokemon/porygon2/icon.4bpp"
 
 	.align 2
@@ -8203,7 +8203,7 @@ gFile_graphics_pokemon_palettes_stantler_shiny_palette:: @ 8DCFD04
 	.incbin "graphics/pokemon/stantler/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_stantler_icon:: @ 8DCFD2C
+gMonIcon_Stantler:: @ 8DCFD2C
 	.incbin "graphics/pokemon/stantler/icon.4bpp"
 
 	.align 2
@@ -8227,7 +8227,7 @@ gFile_graphics_pokemon_palettes_smeargle_shiny_palette:: @ 8DD082C
 	.incbin "graphics/pokemon/smeargle/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_smeargle_icon:: @ 8DD0854
+gMonIcon_Smeargle:: @ 8DD0854
 	.incbin "graphics/pokemon/smeargle/icon.4bpp"
 
 	.align 2
@@ -8251,7 +8251,7 @@ gFile_graphics_pokemon_palettes_tyrogue_shiny_palette:: @ 8DD1244
 	.incbin "graphics/pokemon/tyrogue/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_tyrogue_icon:: @ 8DD126C
+gMonIcon_Tyrogue:: @ 8DD126C
 	.incbin "graphics/pokemon/tyrogue/icon.4bpp"
 
 	.align 2
@@ -8275,7 +8275,7 @@ gFile_graphics_pokemon_palettes_hitmontop_shiny_palette:: @ 8DD1E68
 	.incbin "graphics/pokemon/hitmontop/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_hitmontop_icon:: @ 8DD1E90
+gMonIcon_Hitmontop:: @ 8DD1E90
 	.incbin "graphics/pokemon/hitmontop/icon.4bpp"
 
 gUnknown_hitmontop_unknown_data:: @ 8DD2290
@@ -8302,7 +8302,7 @@ gFile_graphics_pokemon_palettes_smoochum_shiny_palette:: @ 8DD29A8
 	.incbin "graphics/pokemon/smoochum/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_smoochum_icon:: @ 8DD29D0
+gMonIcon_Smoochum:: @ 8DD29D0
 	.incbin "graphics/pokemon/smoochum/icon.4bpp"
 
 	.align 2
@@ -8326,7 +8326,7 @@ gFile_graphics_pokemon_palettes_elekid_shiny_palette:: @ 8DD3478
 	.incbin "graphics/pokemon/elekid/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_elekid_icon:: @ 8DD34A0
+gMonIcon_Elekid:: @ 8DD34A0
 	.incbin "graphics/pokemon/elekid/icon.4bpp"
 
 	.align 2
@@ -8350,7 +8350,7 @@ gFile_graphics_pokemon_palettes_magby_shiny_palette:: @ 8DD3E18
 	.incbin "graphics/pokemon/magby/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_magby_icon:: @ 8DD3E40
+gMonIcon_Magby:: @ 8DD3E40
 	.incbin "graphics/pokemon/magby/icon.4bpp"
 
 	.align 2
@@ -8374,7 +8374,7 @@ gFile_graphics_pokemon_palettes_miltank_shiny_palette:: @ 8DD49D4
 	.incbin "graphics/pokemon/miltank/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_miltank_icon:: @ 8DD49FC
+gMonIcon_Miltank:: @ 8DD49FC
 	.incbin "graphics/pokemon/miltank/icon.4bpp"
 
 	.align 2
@@ -8398,7 +8398,7 @@ gFile_graphics_pokemon_palettes_blissey_shiny_palette:: @ 8DD54F8
 	.incbin "graphics/pokemon/blissey/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_blissey_icon:: @ 8DD5520
+gMonIcon_Blissey:: @ 8DD5520
 	.incbin "graphics/pokemon/blissey/icon.4bpp"
 
 	.align 2
@@ -8422,7 +8422,7 @@ gFile_graphics_pokemon_palettes_raikou_shiny_palette:: @ 8DD628C
 	.incbin "graphics/pokemon/raikou/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_raikou_icon:: @ 8DD62B4
+gMonIcon_Raikou:: @ 8DD62B4
 	.incbin "graphics/pokemon/raikou/icon.4bpp"
 
 	.align 2
@@ -8446,7 +8446,7 @@ gFile_graphics_pokemon_palettes_entei_shiny_palette:: @ 8DD711C
 	.incbin "graphics/pokemon/entei/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_entei_icon:: @ 8DD7144
+gMonIcon_Entei:: @ 8DD7144
 	.incbin "graphics/pokemon/entei/icon.4bpp"
 
 	.align 2
@@ -8470,7 +8470,7 @@ gFile_graphics_pokemon_palettes_suicune_shiny_palette:: @ 8DD7FEC
 	.incbin "graphics/pokemon/suicune/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_suicune_icon:: @ 8DD8014
+gMonIcon_Suicune:: @ 8DD8014
 	.incbin "graphics/pokemon/suicune/icon.4bpp"
 
 	.align 2
@@ -8494,7 +8494,7 @@ gFile_graphics_pokemon_palettes_larvitar_shiny_palette:: @ 8DD8964
 	.incbin "graphics/pokemon/larvitar/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_larvitar_icon:: @ 8DD898C
+gMonIcon_Larvitar:: @ 8DD898C
 	.incbin "graphics/pokemon/larvitar/icon.4bpp"
 
 	.align 2
@@ -8518,7 +8518,7 @@ gFile_graphics_pokemon_palettes_pupitar_shiny_palette:: @ 8DD93FC
 	.incbin "graphics/pokemon/pupitar/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_pupitar_icon:: @ 8DD9424
+gMonIcon_Pupitar:: @ 8DD9424
 	.incbin "graphics/pokemon/pupitar/icon.4bpp"
 
 	.align 2
@@ -8542,7 +8542,7 @@ gFile_graphics_pokemon_palettes_tyranitar_shiny_palette:: @ 8DDA194
 	.incbin "graphics/pokemon/tyranitar/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_tyranitar_icon:: @ 8DDA1BC
+gMonIcon_Tyranitar:: @ 8DDA1BC
 	.incbin "graphics/pokemon/tyranitar/icon.4bpp"
 
 	.align 2
@@ -8566,7 +8566,7 @@ gFile_graphics_pokemon_palettes_lugia_shiny_palette:: @ 8DDAE9C
 	.incbin "graphics/pokemon/lugia/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_lugia_icon:: @ 8DDAEC4
+gMonIcon_Lugia:: @ 8DDAEC4
 	.incbin "graphics/pokemon/lugia/icon.4bpp"
 
 	.align 2
@@ -8590,7 +8590,7 @@ gFile_graphics_pokemon_palettes_ho_oh_shiny_palette:: @ 8DDBD70
 	.incbin "graphics/pokemon/ho_oh/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_ho_oh_icon:: @ 8DDBD98
+gMonIcon_Ho_Oh:: @ 8DDBD98
 	.incbin "graphics/pokemon/ho_oh/icon.4bpp"
 
 	.align 2
@@ -8614,7 +8614,7 @@ gFile_graphics_pokemon_palettes_celebi_shiny_palette:: @ 8DDC804
 	.incbin "graphics/pokemon/celebi/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_celebi_icon:: @ 8DDC82C
+gMonIcon_Celebi:: @ 8DDC82C
 	.incbin "graphics/pokemon/celebi/icon.4bpp"
 
 	.align 2
@@ -8654,7 +8654,7 @@ gFile_graphics_pokemon_palettes_treecko_shiny_palette:: @ 8DDD5AC
 	.incbin "graphics/pokemon/treecko/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_treecko_icon:: @ 8DDD5D4
+gMonIcon_Treecko:: @ 8DDD5D4
 	.incbin "graphics/pokemon/treecko/icon.4bpp"
 
 	.align 2
@@ -8678,7 +8678,7 @@ gFile_graphics_pokemon_palettes_grovyle_shiny_palette:: @ 8DDE1E4
 	.incbin "graphics/pokemon/grovyle/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_grovyle_icon:: @ 8DDE20C
+gMonIcon_Grovyle:: @ 8DDE20C
 	.incbin "graphics/pokemon/grovyle/icon.4bpp"
 
 	.align 2
@@ -8702,7 +8702,7 @@ gFile_graphics_pokemon_palettes_sceptile_shiny_palette:: @ 8DDEF54
 	.incbin "graphics/pokemon/sceptile/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_sceptile_icon:: @ 8DDEF7C
+gMonIcon_Sceptile:: @ 8DDEF7C
 	.incbin "graphics/pokemon/sceptile/icon.4bpp"
 
 	.align 2
@@ -8726,7 +8726,7 @@ gFile_graphics_pokemon_palettes_torchic_shiny_palette:: @ 8DDF938
 	.incbin "graphics/pokemon/torchic/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_torchic_icon:: @ 8DDF960
+gMonIcon_Torchic:: @ 8DDF960
 	.incbin "graphics/pokemon/torchic/icon.4bpp"
 
 	.align 2
@@ -8750,7 +8750,7 @@ gFile_graphics_pokemon_palettes_combusken_shiny_palette:: @ 8DE0564
 	.incbin "graphics/pokemon/combusken/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_combusken_icon:: @ 8DE058C
+gMonIcon_Combusken:: @ 8DE058C
 	.incbin "graphics/pokemon/combusken/icon.4bpp"
 
 	.align 2
@@ -8774,7 +8774,7 @@ gFile_graphics_pokemon_palettes_blaziken_shiny_palette:: @ 8DE1228
 	.incbin "graphics/pokemon/blaziken/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_blaziken_icon:: @ 8DE1250
+gMonIcon_Blaziken:: @ 8DE1250
 	.incbin "graphics/pokemon/blaziken/icon.4bpp"
 
 	.align 2
@@ -8798,7 +8798,7 @@ gFile_graphics_pokemon_palettes_mudkip_shiny_palette:: @ 8DE1C30
 	.incbin "graphics/pokemon/mudkip/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_mudkip_icon:: @ 8DE1C58
+gMonIcon_Mudkip:: @ 8DE1C58
 	.incbin "graphics/pokemon/mudkip/icon.4bpp"
 
 	.align 2
@@ -8822,7 +8822,7 @@ gFile_graphics_pokemon_palettes_marshtomp_shiny_palette:: @ 8DE27D8
 	.incbin "graphics/pokemon/marshtomp/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_marshtomp_icon:: @ 8DE2800
+gMonIcon_Marshtomp:: @ 8DE2800
 	.incbin "graphics/pokemon/marshtomp/icon.4bpp"
 
 	.align 2
@@ -8846,7 +8846,7 @@ gFile_graphics_pokemon_palettes_swampert_shiny_palette:: @ 8DE3578
 	.incbin "graphics/pokemon/swampert/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_swampert_icon:: @ 8DE35A0
+gMonIcon_Swampert:: @ 8DE35A0
 	.incbin "graphics/pokemon/swampert/icon.4bpp"
 
 	.align 2
@@ -8870,7 +8870,7 @@ gFile_graphics_pokemon_palettes_poochyena_shiny_palette:: @ 8DE3FDC
 	.incbin "graphics/pokemon/poochyena/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_poochyena_icon:: @ 8DE4004
+gMonIcon_Poochyena:: @ 8DE4004
 	.incbin "graphics/pokemon/poochyena/icon.4bpp"
 
 	.align 2
@@ -8894,7 +8894,7 @@ gFile_graphics_pokemon_palettes_mightyena_shiny_palette:: @ 8DE4BFC
 	.incbin "graphics/pokemon/mightyena/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_mightyena_icon:: @ 8DE4C24
+gMonIcon_Mightyena:: @ 8DE4C24
 	.incbin "graphics/pokemon/mightyena/icon.4bpp"
 
 	.align 2
@@ -8918,7 +8918,7 @@ gFile_graphics_pokemon_palettes_zigzagoon_shiny_palette:: @ 8DE577C
 	.incbin "graphics/pokemon/zigzagoon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_zigzagoon_icon:: @ 8DE57A4
+gMonIcon_Zigzagoon:: @ 8DE57A4
 	.incbin "graphics/pokemon/zigzagoon/icon.4bpp"
 
 	.align 2
@@ -8942,7 +8942,7 @@ gFile_graphics_pokemon_palettes_linoone_shiny_palette:: @ 8DE6230
 	.incbin "graphics/pokemon/linoone/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_linoone_icon:: @ 8DE6258
+gMonIcon_Linoone:: @ 8DE6258
 	.incbin "graphics/pokemon/linoone/icon.4bpp"
 
 	.align 2
@@ -8966,7 +8966,7 @@ gFile_graphics_pokemon_palettes_wurmple_shiny_palette:: @ 8DE6B74
 	.incbin "graphics/pokemon/wurmple/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_wurmple_icon:: @ 8DE6B9C
+gMonIcon_Wurmple:: @ 8DE6B9C
 	.incbin "graphics/pokemon/wurmple/icon.4bpp"
 
 	.align 2
@@ -8990,7 +8990,7 @@ gFile_graphics_pokemon_palettes_silcoon_shiny_palette:: @ 8DE7480
 	.incbin "graphics/pokemon/silcoon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_silcoon_icon:: @ 8DE74A8
+gMonIcon_Silcoon:: @ 8DE74A8
 	.incbin "graphics/pokemon/silcoon/icon.4bpp"
 
 	.align 2
@@ -9014,7 +9014,7 @@ gFile_graphics_pokemon_palettes_beautifly_shiny_palette:: @ 8DE7FF8
 	.incbin "graphics/pokemon/beautifly/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_beautifly_icon:: @ 8DE8020
+gMonIcon_Beautifly:: @ 8DE8020
 	.incbin "graphics/pokemon/beautifly/icon.4bpp"
 
 	.align 2
@@ -9038,7 +9038,7 @@ gFile_graphics_pokemon_palettes_cascoon_shiny_palette:: @ 8DE88E4
 	.incbin "graphics/pokemon/cascoon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_cascoon_icon:: @ 8DE890C
+gMonIcon_Cascoon:: @ 8DE890C
 	.incbin "graphics/pokemon/cascoon/icon.4bpp"
 
 	.align 2
@@ -9062,7 +9062,7 @@ gFile_graphics_pokemon_palettes_dustox_shiny_palette:: @ 8DE9314
 	.incbin "graphics/pokemon/dustox/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_dustox_icon:: @ 8DE933C
+gMonIcon_Dustox:: @ 8DE933C
 	.incbin "graphics/pokemon/dustox/icon.4bpp"
 
 	.align 2
@@ -9086,7 +9086,7 @@ gFile_graphics_pokemon_palettes_lotad_shiny_palette:: @ 8DE9CCC
 	.incbin "graphics/pokemon/lotad/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_lotad_icon:: @ 8DE9CF4
+gMonIcon_Lotad:: @ 8DE9CF4
 	.incbin "graphics/pokemon/lotad/icon.4bpp"
 
 	.align 2
@@ -9110,7 +9110,7 @@ gFile_graphics_pokemon_palettes_lombre_shiny_palette:: @ 8DEA750
 	.incbin "graphics/pokemon/lombre/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_lombre_icon:: @ 8DEA778
+gMonIcon_Lombre:: @ 8DEA778
 	.incbin "graphics/pokemon/lombre/icon.4bpp"
 
 	.align 2
@@ -9134,7 +9134,7 @@ gFile_graphics_pokemon_palettes_ludicolo_shiny_palette:: @ 8DEB3A0
 	.incbin "graphics/pokemon/ludicolo/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_ludicolo_icon:: @ 8DEB3C8
+gMonIcon_Ludicolo:: @ 8DEB3C8
 	.incbin "graphics/pokemon/ludicolo/icon.4bpp"
 
 	.align 2
@@ -9158,7 +9158,7 @@ gFile_graphics_pokemon_palettes_seedot_shiny_palette:: @ 8DEBD84
 	.incbin "graphics/pokemon/seedot/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_seedot_icon:: @ 8DEBDAC
+gMonIcon_Seedot:: @ 8DEBDAC
 	.incbin "graphics/pokemon/seedot/icon.4bpp"
 
 	.align 2
@@ -9182,7 +9182,7 @@ gFile_graphics_pokemon_palettes_nuzleaf_shiny_palette:: @ 8DEC7A8
 	.incbin "graphics/pokemon/nuzleaf/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_nuzleaf_icon:: @ 8DEC7D0
+gMonIcon_Nuzleaf:: @ 8DEC7D0
 	.incbin "graphics/pokemon/nuzleaf/icon.4bpp"
 
 	.align 2
@@ -9206,7 +9206,7 @@ gFile_graphics_pokemon_palettes_shiftry_shiny_palette:: @ 8DED398
 	.incbin "graphics/pokemon/shiftry/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_shiftry_icon:: @ 8DED3C0
+gMonIcon_Shiftry:: @ 8DED3C0
 	.incbin "graphics/pokemon/shiftry/icon.4bpp"
 
 	.align 2
@@ -9230,7 +9230,7 @@ gFile_graphics_pokemon_palettes_nincada_shiny_palette:: @ 8DEDD60
 	.incbin "graphics/pokemon/nincada/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_nincada_icon:: @ 8DEDD88
+gMonIcon_Nincada:: @ 8DEDD88
 	.incbin "graphics/pokemon/nincada/icon.4bpp"
 
 	.align 2
@@ -9254,7 +9254,7 @@ gFile_graphics_pokemon_palettes_ninjask_shiny_palette:: @ 8DEE90C
 	.incbin "graphics/pokemon/ninjask/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_ninjask_icon:: @ 8DEE934
+gMonIcon_Ninjask:: @ 8DEE934
 	.incbin "graphics/pokemon/ninjask/icon.4bpp"
 
 	.align 2
@@ -9278,7 +9278,7 @@ gFile_graphics_pokemon_palettes_shedinja_shiny_palette:: @ 8DEF43C
 	.incbin "graphics/pokemon/shedinja/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_shedinja_icon:: @ 8DEF464
+gMonIcon_Shedinja:: @ 8DEF464
 	.incbin "graphics/pokemon/shedinja/icon.4bpp"
 
 	.align 2
@@ -9302,7 +9302,7 @@ gFile_graphics_pokemon_palettes_taillow_shiny_palette:: @ 8DEFD24
 	.incbin "graphics/pokemon/taillow/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_taillow_icon:: @ 8DEFD4C
+gMonIcon_Taillow:: @ 8DEFD4C
 	.incbin "graphics/pokemon/taillow/icon.4bpp"
 
 	.align 2
@@ -9326,7 +9326,7 @@ gFile_graphics_pokemon_palettes_swellow_shiny_palette:: @ 8DF0890
 	.incbin "graphics/pokemon/swellow/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_swellow_icon:: @ 8DF08B8
+gMonIcon_Swellow:: @ 8DF08B8
 	.incbin "graphics/pokemon/swellow/icon.4bpp"
 
 	.align 2
@@ -9350,7 +9350,7 @@ gFile_graphics_pokemon_palettes_shroomish_shiny_palette:: @ 8DF1248
 	.incbin "graphics/pokemon/shroomish/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_shroomish_icon:: @ 8DF1270
+gMonIcon_Shroomish:: @ 8DF1270
 	.incbin "graphics/pokemon/shroomish/icon.4bpp"
 
 	.align 2
@@ -9374,7 +9374,7 @@ gFile_graphics_pokemon_palettes_breloom_shiny_palette:: @ 8DF1E80
 	.incbin "graphics/pokemon/breloom/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_breloom_icon:: @ 8DF1EA8
+gMonIcon_Breloom:: @ 8DF1EA8
 	.incbin "graphics/pokemon/breloom/icon.4bpp"
 
 	.align 2
@@ -9398,7 +9398,7 @@ gFile_graphics_pokemon_palettes_spinda_shiny_palette:: @ 8DF292C
 	.incbin "graphics/pokemon/spinda/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_spinda_icon:: @ 8DF2954
+gMonIcon_Spinda:: @ 8DF2954
 	.incbin "graphics/pokemon/spinda/icon.4bpp"
 
 	.align 2
@@ -9422,7 +9422,7 @@ gFile_graphics_pokemon_palettes_wingull_shiny_palette:: @ 8DF3328
 	.incbin "graphics/pokemon/wingull/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_wingull_icon:: @ 8DF3350
+gMonIcon_Wingull:: @ 8DF3350
 	.incbin "graphics/pokemon/wingull/icon.4bpp"
 
 	.align 2
@@ -9446,7 +9446,7 @@ gFile_graphics_pokemon_palettes_pelipper_shiny_palette:: @ 8DF3EB0
 	.incbin "graphics/pokemon/pelipper/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_pelipper_icon:: @ 8DF3ED8
+gMonIcon_Pelipper:: @ 8DF3ED8
 	.incbin "graphics/pokemon/pelipper/icon.4bpp"
 
 	.align 2
@@ -9470,7 +9470,7 @@ gFile_graphics_pokemon_palettes_surskit_shiny_palette:: @ 8DF4764
 	.incbin "graphics/pokemon/surskit/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_surskit_icon:: @ 8DF478C
+gMonIcon_Surskit:: @ 8DF478C
 	.incbin "graphics/pokemon/surskit/icon.4bpp"
 
 	.align 2
@@ -9494,7 +9494,7 @@ gFile_graphics_pokemon_palettes_masquerain_shiny_palette:: @ 8DF52C8
 	.incbin "graphics/pokemon/masquerain/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_masquerain_icon:: @ 8DF52F0
+gMonIcon_Masquerain:: @ 8DF52F0
 	.incbin "graphics/pokemon/masquerain/icon.4bpp"
 
 	.align 2
@@ -9518,7 +9518,7 @@ gFile_graphics_pokemon_palettes_wailmer_shiny_palette:: @ 8DF5BFC
 	.incbin "graphics/pokemon/wailmer/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_wailmer_icon:: @ 8DF5C24
+gMonIcon_Wailmer:: @ 8DF5C24
 	.incbin "graphics/pokemon/wailmer/icon.4bpp"
 
 	.align 2
@@ -9542,7 +9542,7 @@ gFile_graphics_pokemon_palettes_wailord_shiny_palette:: @ 8DF6648
 	.incbin "graphics/pokemon/wailord/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_wailord_icon:: @ 8DF6670
+gMonIcon_Wailord:: @ 8DF6670
 	.incbin "graphics/pokemon/wailord/icon.4bpp"
 
 	.align 2
@@ -9566,7 +9566,7 @@ gFile_graphics_pokemon_palettes_skitty_shiny_palette:: @ 8DF7100
 	.incbin "graphics/pokemon/skitty/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_skitty_icon:: @ 8DF7128
+gMonIcon_Skitty:: @ 8DF7128
 	.incbin "graphics/pokemon/skitty/icon.4bpp"
 
 	.align 2
@@ -9590,7 +9590,7 @@ gFile_graphics_pokemon_palettes_delcatty_shiny_palette:: @ 8DF7C98
 	.incbin "graphics/pokemon/delcatty/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_delcatty_icon:: @ 8DF7CC0
+gMonIcon_Delcatty:: @ 8DF7CC0
 	.incbin "graphics/pokemon/delcatty/icon.4bpp"
 
 	.align 2
@@ -9614,7 +9614,7 @@ gFile_graphics_pokemon_palettes_kecleon_shiny_palette:: @ 8DF8860
 	.incbin "graphics/pokemon/kecleon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_kecleon_icon:: @ 8DF8888
+gMonIcon_Kecleon:: @ 8DF8888
 	.incbin "graphics/pokemon/kecleon/icon.4bpp"
 
 	.align 2
@@ -9638,7 +9638,7 @@ gFile_graphics_pokemon_palettes_baltoy_shiny_palette:: @ 8DF9194
 	.incbin "graphics/pokemon/baltoy/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_baltoy_icon:: @ 8DF91B4
+gMonIcon_Baltoy:: @ 8DF91B4
 	.incbin "graphics/pokemon/baltoy/icon.4bpp"
 
 	.align 2
@@ -9662,7 +9662,7 @@ gFile_graphics_pokemon_palettes_claydol_shiny_palette:: @ 8DF9D88
 	.incbin "graphics/pokemon/claydol/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_claydol_icon:: @ 8DF9DB0
+gMonIcon_Claydol:: @ 8DF9DB0
 	.incbin "graphics/pokemon/claydol/icon.4bpp"
 
 	.align 2
@@ -9686,7 +9686,7 @@ gFile_graphics_pokemon_palettes_nosepass_shiny_palette:: @ 8DFA764
 	.incbin "graphics/pokemon/nosepass/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_nosepass_icon:: @ 8DFA78C
+gMonIcon_Nosepass:: @ 8DFA78C
 	.incbin "graphics/pokemon/nosepass/icon.4bpp"
 
 	.align 2
@@ -9710,7 +9710,7 @@ gFile_graphics_pokemon_palettes_torkoal_shiny_palette:: @ 8DFB348
 	.incbin "graphics/pokemon/torkoal/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_torkoal_icon:: @ 8DFB370
+gMonIcon_Torkoal:: @ 8DFB370
 	.incbin "graphics/pokemon/torkoal/icon.4bpp"
 
 	.align 2
@@ -9734,7 +9734,7 @@ gFile_graphics_pokemon_palettes_sableye_shiny_palette:: @ 8DFBDB4
 	.incbin "graphics/pokemon/sableye/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_sableye_icon:: @ 8DFBDDC
+gMonIcon_Sableye:: @ 8DFBDDC
 	.incbin "graphics/pokemon/sableye/icon.4bpp"
 
 	.align 2
@@ -9758,7 +9758,7 @@ gFile_graphics_pokemon_palettes_barboach_shiny_palette:: @ 8DFC744
 	.incbin "graphics/pokemon/barboach/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_barboach_icon:: @ 8DFC76C
+gMonIcon_Barboach:: @ 8DFC76C
 	.incbin "graphics/pokemon/barboach/icon.4bpp"
 
 	.align 2
@@ -9782,7 +9782,7 @@ gFile_graphics_pokemon_palettes_whiscash_shiny_palette:: @ 8DFD278
 	.incbin "graphics/pokemon/whiscash/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_whiscash_icon:: @ 8DFD2A0
+gMonIcon_Whiscash:: @ 8DFD2A0
 	.incbin "graphics/pokemon/whiscash/icon.4bpp"
 
 	.align 2
@@ -9806,7 +9806,7 @@ gFile_graphics_pokemon_palettes_luvdisc_shiny_palette:: @ 8DFDA78
 	.incbin "graphics/pokemon/luvdisc/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_luvdisc_icon:: @ 8DFDA9C
+gMonIcon_Luvdisc:: @ 8DFDA9C
 	.incbin "graphics/pokemon/luvdisc/icon.4bpp"
 
 	.align 2
@@ -9830,7 +9830,7 @@ gFile_graphics_pokemon_palettes_corphish_shiny_palette:: @ 8DFE55C
 	.incbin "graphics/pokemon/corphish/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_corphish_icon:: @ 8DFE584
+gMonIcon_Corphish:: @ 8DFE584
 	.incbin "graphics/pokemon/corphish/icon.4bpp"
 
 	.align 2
@@ -9854,7 +9854,7 @@ gFile_graphics_pokemon_palettes_crawdaunt_shiny_palette:: @ 8DFF240
 	.incbin "graphics/pokemon/crawdaunt/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_crawdaunt_icon:: @ 8DFF268
+gMonIcon_Crawdaunt:: @ 8DFF268
 	.incbin "graphics/pokemon/crawdaunt/icon.4bpp"
 
 	.align 2
@@ -9878,7 +9878,7 @@ gFile_graphics_pokemon_palettes_feebas_shiny_palette:: @ 8DFFC74
 	.incbin "graphics/pokemon/feebas/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_feebas_icon:: @ 8DFFC9C
+gMonIcon_Feebas:: @ 8DFFC9C
 	.incbin "graphics/pokemon/feebas/icon.4bpp"
 
 	.align 2
@@ -9902,7 +9902,7 @@ gFile_graphics_pokemon_palettes_milotic_shiny_palette:: @ 8E00868
 	.incbin "graphics/pokemon/milotic/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_milotic_icon:: @ 8E00890
+gMonIcon_Milotic:: @ 8E00890
 	.incbin "graphics/pokemon/milotic/icon.4bpp"
 
 	.align 2
@@ -9926,7 +9926,7 @@ gFile_graphics_pokemon_palettes_carvanha_shiny_palette:: @ 8E01314
 	.incbin "graphics/pokemon/carvanha/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_carvanha_icon:: @ 8E0133C
+gMonIcon_Carvanha:: @ 8E0133C
 	.incbin "graphics/pokemon/carvanha/icon.4bpp"
 
 	.align 2
@@ -9950,7 +9950,7 @@ gFile_graphics_pokemon_palettes_sharpedo_shiny_palette:: @ 8E01E6C
 	.incbin "graphics/pokemon/sharpedo/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_sharpedo_icon:: @ 8E01E94
+gMonIcon_Sharpedo:: @ 8E01E94
 	.incbin "graphics/pokemon/sharpedo/icon.4bpp"
 
 	.align 2
@@ -9974,7 +9974,7 @@ gFile_graphics_pokemon_palettes_trapinch_shiny_palette:: @ 8E02718
 	.incbin "graphics/pokemon/trapinch/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_trapinch_icon:: @ 8E02740
+gMonIcon_Trapinch:: @ 8E02740
 	.incbin "graphics/pokemon/trapinch/icon.4bpp"
 
 	.align 2
@@ -9998,7 +9998,7 @@ gFile_graphics_pokemon_palettes_vibrava_shiny_palette:: @ 8E03170
 	.incbin "graphics/pokemon/vibrava/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_vibrava_icon:: @ 8E03198
+gMonIcon_Vibrava:: @ 8E03198
 	.incbin "graphics/pokemon/vibrava/icon.4bpp"
 
 	.align 2
@@ -10022,7 +10022,7 @@ gFile_graphics_pokemon_palettes_flygon_shiny_palette:: @ 8E03F0C
 	.incbin "graphics/pokemon/flygon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_flygon_icon:: @ 8E03F34
+gMonIcon_Flygon:: @ 8E03F34
 	.incbin "graphics/pokemon/flygon/icon.4bpp"
 
 	.align 2
@@ -10046,7 +10046,7 @@ gFile_graphics_pokemon_palettes_makuhita_shiny_palette:: @ 8E04984
 	.incbin "graphics/pokemon/makuhita/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_makuhita_icon:: @ 8E049A8
+gMonIcon_Makuhita:: @ 8E049A8
 	.incbin "graphics/pokemon/makuhita/icon.4bpp"
 
 	.align 2
@@ -10070,7 +10070,7 @@ gFile_graphics_pokemon_palettes_hariyama_shiny_palette:: @ 8E05680
 	.incbin "graphics/pokemon/hariyama/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_hariyama_icon:: @ 8E056A8
+gMonIcon_Hariyama:: @ 8E056A8
 	.incbin "graphics/pokemon/hariyama/icon.4bpp"
 
 	.align 2
@@ -10094,7 +10094,7 @@ gFile_graphics_pokemon_palettes_electrike_shiny_palette:: @ 8E0600C
 	.incbin "graphics/pokemon/electrike/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_electrike_icon:: @ 8E06034
+gMonIcon_Electrike:: @ 8E06034
 	.incbin "graphics/pokemon/electrike/icon.4bpp"
 
 	.align 2
@@ -10118,7 +10118,7 @@ gFile_graphics_pokemon_palettes_manectric_shiny_palette:: @ 8E069D8
 	.incbin "graphics/pokemon/manectric/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_manectric_icon:: @ 8E06A00
+gMonIcon_Manectric:: @ 8E06A00
 	.incbin "graphics/pokemon/manectric/icon.4bpp"
 
 	.align 2
@@ -10142,7 +10142,7 @@ gFile_graphics_pokemon_palettes_numel_shiny_palette:: @ 8E073D4
 	.incbin "graphics/pokemon/numel/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_numel_icon:: @ 8E073FC
+gMonIcon_Numel:: @ 8E073FC
 	.incbin "graphics/pokemon/numel/icon.4bpp"
 
 	.align 2
@@ -10166,7 +10166,7 @@ gFile_graphics_pokemon_palettes_camerupt_shiny_palette:: @ 8E07F20
 	.incbin "graphics/pokemon/camerupt/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_camerupt_icon:: @ 8E07F48
+gMonIcon_Camerupt:: @ 8E07F48
 	.incbin "graphics/pokemon/camerupt/icon.4bpp"
 
 	.align 2
@@ -10190,7 +10190,7 @@ gFile_graphics_pokemon_palettes_spheal_shiny_palette:: @ 8E08800
 	.incbin "graphics/pokemon/spheal/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_spheal_icon:: @ 8E08828
+gMonIcon_Spheal:: @ 8E08828
 	.incbin "graphics/pokemon/spheal/icon.4bpp"
 
 	.align 2
@@ -10214,7 +10214,7 @@ gFile_graphics_pokemon_palettes_sealeo_shiny_palette:: @ 8E0926C
 	.incbin "graphics/pokemon/sealeo/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_sealeo_icon:: @ 8E09294
+gMonIcon_Sealeo:: @ 8E09294
 	.incbin "graphics/pokemon/sealeo/icon.4bpp"
 
 	.align 2
@@ -10238,7 +10238,7 @@ gFile_graphics_pokemon_palettes_walrein_shiny_palette:: @ 8E09F04
 	.incbin "graphics/pokemon/walrein/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_walrein_icon:: @ 8E09F2C
+gMonIcon_Walrein:: @ 8E09F2C
 	.incbin "graphics/pokemon/walrein/icon.4bpp"
 
 	.align 2
@@ -10262,7 +10262,7 @@ gFile_graphics_pokemon_palettes_cacnea_shiny_palette:: @ 8E0A9E4
 	.incbin "graphics/pokemon/cacnea/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_cacnea_icon:: @ 8E0AA0C
+gMonIcon_Cacnea:: @ 8E0AA0C
 	.incbin "graphics/pokemon/cacnea/icon.4bpp"
 
 	.align 2
@@ -10286,7 +10286,7 @@ gFile_graphics_pokemon_palettes_cacturne_shiny_palette:: @ 8E0B58C
 	.incbin "graphics/pokemon/cacturne/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_cacturne_icon:: @ 8E0B5B4
+gMonIcon_Cacturne:: @ 8E0B5B4
 	.incbin "graphics/pokemon/cacturne/icon.4bpp"
 
 	.align 2
@@ -10310,7 +10310,7 @@ gFile_graphics_pokemon_palettes_snorunt_shiny_palette:: @ 8E0BFA4
 	.incbin "graphics/pokemon/snorunt/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_snorunt_icon:: @ 8E0BFCC
+gMonIcon_Snorunt:: @ 8E0BFCC
 	.incbin "graphics/pokemon/snorunt/icon.4bpp"
 
 	.align 2
@@ -10334,7 +10334,7 @@ gFile_graphics_pokemon_palettes_glalie_shiny_palette:: @ 8E0CB8C
 	.incbin "graphics/pokemon/glalie/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_glalie_icon:: @ 8E0CBB4
+gMonIcon_Glalie:: @ 8E0CBB4
 	.incbin "graphics/pokemon/glalie/icon.4bpp"
 
 	.align 2
@@ -10358,7 +10358,7 @@ gFile_graphics_pokemon_palettes_lunatone_shiny_palette:: @ 8E0D67C
 	.incbin "graphics/pokemon/lunatone/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_lunatone_icon:: @ 8E0D6A4
+gMonIcon_Lunatone:: @ 8E0D6A4
 	.incbin "graphics/pokemon/lunatone/icon.4bpp"
 
 	.align 2
@@ -10382,7 +10382,7 @@ gFile_graphics_pokemon_palettes_solrock_shiny_palette:: @ 8E0E324
 	.incbin "graphics/pokemon/solrock/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_solrock_icon:: @ 8E0E34C
+gMonIcon_Solrock:: @ 8E0E34C
 	.incbin "graphics/pokemon/solrock/icon.4bpp"
 
 	.align 2
@@ -10406,7 +10406,7 @@ gFile_graphics_pokemon_palettes_azurill_shiny_palette:: @ 8E0ED74
 	.incbin "graphics/pokemon/azurill/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_azurill_icon:: @ 8E0ED9C
+gMonIcon_Azurill:: @ 8E0ED9C
 	.incbin "graphics/pokemon/azurill/icon.4bpp"
 
 	.align 2
@@ -10430,7 +10430,7 @@ gFile_graphics_pokemon_palettes_spoink_shiny_palette:: @ 8E0F690
 	.incbin "graphics/pokemon/spoink/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_spoink_icon:: @ 8E0F6B8
+gMonIcon_Spoink:: @ 8E0F6B8
 	.incbin "graphics/pokemon/spoink/icon.4bpp"
 
 	.align 2
@@ -10454,7 +10454,7 @@ gFile_graphics_pokemon_palettes_grumpig_shiny_palette:: @ 8E1021C
 	.incbin "graphics/pokemon/grumpig/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_grumpig_icon:: @ 8E10244
+gMonIcon_Grumpig:: @ 8E10244
 	.incbin "graphics/pokemon/grumpig/icon.4bpp"
 
 	.align 2
@@ -10478,7 +10478,7 @@ gFile_graphics_pokemon_palettes_plusle_shiny_palette:: @ 8E10BD0
 	.incbin "graphics/pokemon/plusle/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_plusle_icon:: @ 8E10BF8
+gMonIcon_Plusle:: @ 8E10BF8
 	.incbin "graphics/pokemon/plusle/icon.4bpp"
 
 	.align 2
@@ -10502,7 +10502,7 @@ gFile_graphics_pokemon_palettes_minun_shiny_palette:: @ 8E11570
 	.incbin "graphics/pokemon/minun/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_minun_icon:: @ 8E11598
+gMonIcon_Minun:: @ 8E11598
 	.incbin "graphics/pokemon/minun/icon.4bpp"
 
 	.align 2
@@ -10526,7 +10526,7 @@ gFile_graphics_pokemon_palettes_mawile_shiny_palette:: @ 8E1219C
 	.incbin "graphics/pokemon/mawile/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_mawile_icon:: @ 8E121C4
+gMonIcon_Mawile:: @ 8E121C4
 	.incbin "graphics/pokemon/mawile/icon.4bpp"
 
 	.align 2
@@ -10550,7 +10550,7 @@ gFile_graphics_pokemon_palettes_meditite_shiny_palette:: @ 8E12B8C
 	.incbin "graphics/pokemon/meditite/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_meditite_icon:: @ 8E12BB0
+gMonIcon_Meditite:: @ 8E12BB0
 	.incbin "graphics/pokemon/meditite/icon.4bpp"
 
 	.align 2
@@ -10574,7 +10574,7 @@ gFile_graphics_pokemon_palettes_medicham_shiny_palette:: @ 8E13660
 	.incbin "graphics/pokemon/medicham/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_medicham_icon:: @ 8E13688
+gMonIcon_Medicham:: @ 8E13688
 	.incbin "graphics/pokemon/medicham/icon.4bpp"
 
 	.align 2
@@ -10598,7 +10598,7 @@ gFile_graphics_pokemon_palettes_swablu_shiny_palette:: @ 8E14160
 	.incbin "graphics/pokemon/swablu/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_swablu_icon:: @ 8E14188
+gMonIcon_Swablu:: @ 8E14188
 	.incbin "graphics/pokemon/swablu/icon.4bpp"
 
 	.align 2
@@ -10622,7 +10622,7 @@ gFile_graphics_pokemon_palettes_altaria_shiny_palette:: @ 8E14D24
 	.incbin "graphics/pokemon/altaria/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_altaria_icon:: @ 8E14D4C
+gMonIcon_Altaria:: @ 8E14D4C
 	.incbin "graphics/pokemon/altaria/icon.4bpp"
 
 	.align 2
@@ -10646,7 +10646,7 @@ gFile_graphics_pokemon_palettes_wynaut_shiny_palette:: @ 8E156BC
 	.incbin "graphics/pokemon/wynaut/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_wynaut_icon:: @ 8E156E4
+gMonIcon_Wynaut:: @ 8E156E4
 	.incbin "graphics/pokemon/wynaut/icon.4bpp"
 
 	.align 2
@@ -10670,7 +10670,7 @@ gFile_graphics_pokemon_palettes_duskull_shiny_palette:: @ 8E160CC
 	.incbin "graphics/pokemon/duskull/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_duskull_icon:: @ 8E160F4
+gMonIcon_Duskull:: @ 8E160F4
 	.incbin "graphics/pokemon/duskull/icon.4bpp"
 
 	.align 2
@@ -10694,7 +10694,7 @@ gFile_graphics_pokemon_palettes_dusclops_shiny_palette:: @ 8E16BC8
 	.incbin "graphics/pokemon/dusclops/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_dusclops_icon:: @ 8E16BF0
+gMonIcon_Dusclops:: @ 8E16BF0
 	.incbin "graphics/pokemon/dusclops/icon.4bpp"
 
 	.align 2
@@ -10718,7 +10718,7 @@ gFile_graphics_pokemon_palettes_roselia_shiny_palette:: @ 8E1776C
 	.incbin "graphics/pokemon/roselia/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_roselia_icon:: @ 8E17794
+gMonIcon_Roselia:: @ 8E17794
 	.incbin "graphics/pokemon/roselia/icon.4bpp"
 
 	.align 2
@@ -10742,7 +10742,7 @@ gFile_graphics_pokemon_palettes_slakoth_shiny_palette:: @ 8E181AC
 	.incbin "graphics/pokemon/slakoth/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_slakoth_icon:: @ 8E181D4
+gMonIcon_Slakoth:: @ 8E181D4
 	.incbin "graphics/pokemon/slakoth/icon.4bpp"
 
 	.align 2
@@ -10766,7 +10766,7 @@ gFile_graphics_pokemon_palettes_vigoroth_shiny_palette:: @ 8E18CE0
 	.incbin "graphics/pokemon/vigoroth/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_vigoroth_icon:: @ 8E18D08
+gMonIcon_Vigoroth:: @ 8E18D08
 	.incbin "graphics/pokemon/vigoroth/icon.4bpp"
 
 	.align 2
@@ -10790,7 +10790,7 @@ gFile_graphics_pokemon_palettes_slaking_shiny_palette:: @ 8E199E8
 	.incbin "graphics/pokemon/slaking/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_slaking_icon:: @ 8E19A10
+gMonIcon_Slaking:: @ 8E19A10
 	.incbin "graphics/pokemon/slaking/icon.4bpp"
 
 	.align 2
@@ -10814,7 +10814,7 @@ gFile_graphics_pokemon_palettes_gulpin_shiny_palette:: @ 8E1A2F4
 	.incbin "graphics/pokemon/gulpin/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_gulpin_icon:: @ 8E1A31C
+gMonIcon_Gulpin:: @ 8E1A31C
 	.incbin "graphics/pokemon/gulpin/icon.4bpp"
 
 	.align 2
@@ -10838,7 +10838,7 @@ gFile_graphics_pokemon_palettes_swalot_shiny_palette:: @ 8E1ADF0
 	.incbin "graphics/pokemon/swalot/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_swalot_icon:: @ 8E1AE18
+gMonIcon_Swalot:: @ 8E1AE18
 	.incbin "graphics/pokemon/swalot/icon.4bpp"
 
 	.align 2
@@ -10862,7 +10862,7 @@ gFile_graphics_pokemon_palettes_tropius_shiny_palette:: @ 8E1BAFC
 	.incbin "graphics/pokemon/tropius/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_tropius_icon:: @ 8E1BB24
+gMonIcon_Tropius:: @ 8E1BB24
 	.incbin "graphics/pokemon/tropius/icon.4bpp"
 
 	.align 2
@@ -10886,7 +10886,7 @@ gFile_graphics_pokemon_palettes_whismur_shiny_palette:: @ 8E1C470
 	.incbin "graphics/pokemon/whismur/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_whismur_icon:: @ 8E1C498
+gMonIcon_Whismur:: @ 8E1C498
 	.incbin "graphics/pokemon/whismur/icon.4bpp"
 
 	.align 2
@@ -10910,7 +10910,7 @@ gFile_graphics_pokemon_palettes_loudred_shiny_palette:: @ 8E1D0C8
 	.incbin "graphics/pokemon/loudred/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_loudred_icon:: @ 8E1D0F0
+gMonIcon_Loudred:: @ 8E1D0F0
 	.incbin "graphics/pokemon/loudred/icon.4bpp"
 
 	.align 2
@@ -10934,7 +10934,7 @@ gFile_graphics_pokemon_palettes_exploud_shiny_palette:: @ 8E1DEAC
 	.incbin "graphics/pokemon/exploud/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_exploud_icon:: @ 8E1DED4
+gMonIcon_Exploud:: @ 8E1DED4
 	.incbin "graphics/pokemon/exploud/icon.4bpp"
 
 	.align 2
@@ -10958,7 +10958,7 @@ gFile_graphics_pokemon_palettes_clamperl_shiny_palette:: @ 8E1E888
 	.incbin "graphics/pokemon/clamperl/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_clamperl_icon:: @ 8E1E8B0
+gMonIcon_Clamperl:: @ 8E1E8B0
 	.incbin "graphics/pokemon/clamperl/icon.4bpp"
 
 	.align 2
@@ -10982,7 +10982,7 @@ gFile_graphics_pokemon_palettes_huntail_shiny_palette:: @ 8E1F418
 	.incbin "graphics/pokemon/huntail/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_huntail_icon:: @ 8E1F440
+gMonIcon_Huntail:: @ 8E1F440
 	.incbin "graphics/pokemon/huntail/icon.4bpp"
 
 	.align 2
@@ -11006,7 +11006,7 @@ gFile_graphics_pokemon_palettes_gorebyss_shiny_palette:: @ 8E1FE80
 	.incbin "graphics/pokemon/gorebyss/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_gorebyss_icon:: @ 8E1FEA8
+gMonIcon_Gorebyss:: @ 8E1FEA8
 	.incbin "graphics/pokemon/gorebyss/icon.4bpp"
 
 	.align 2
@@ -11030,7 +11030,7 @@ gFile_graphics_pokemon_palettes_absol_shiny_palette:: @ 8E20A80
 	.incbin "graphics/pokemon/absol/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_absol_icon:: @ 8E20AA8
+gMonIcon_Absol:: @ 8E20AA8
 	.incbin "graphics/pokemon/absol/icon.4bpp"
 
 	.align 2
@@ -11054,7 +11054,7 @@ gFile_graphics_pokemon_palettes_shuppet_shiny_palette:: @ 8E213C0
 	.incbin "graphics/pokemon/shuppet/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_shuppet_icon:: @ 8E213E8
+gMonIcon_Shuppet:: @ 8E213E8
 	.incbin "graphics/pokemon/shuppet/icon.4bpp"
 
 	.align 2
@@ -11078,7 +11078,7 @@ gFile_graphics_pokemon_palettes_banette_shiny_palette:: @ 8E21D60
 	.incbin "graphics/pokemon/banette/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_banette_icon:: @ 8E21D88
+gMonIcon_Banette:: @ 8E21D88
 	.incbin "graphics/pokemon/banette/icon.4bpp"
 
 	.align 2
@@ -11102,7 +11102,7 @@ gFile_graphics_pokemon_palettes_seviper_shiny_palette:: @ 8E22A7C
 	.incbin "graphics/pokemon/seviper/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_seviper_icon:: @ 8E22AA4
+gMonIcon_Seviper:: @ 8E22AA4
 	.incbin "graphics/pokemon/seviper/icon.4bpp"
 
 	.align 2
@@ -11126,7 +11126,7 @@ gFile_graphics_pokemon_palettes_zangoose_shiny_palette:: @ 8E2362C
 	.incbin "graphics/pokemon/zangoose/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_zangoose_icon:: @ 8E23654
+gMonIcon_Zangoose:: @ 8E23654
 	.incbin "graphics/pokemon/zangoose/icon.4bpp"
 
 	.align 2
@@ -11150,7 +11150,7 @@ gFile_graphics_pokemon_palettes_relicanth_shiny_palette:: @ 8E24188
 	.incbin "graphics/pokemon/relicanth/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_relicanth_icon:: @ 8E241B0
+gMonIcon_Relicanth:: @ 8E241B0
 	.incbin "graphics/pokemon/relicanth/icon.4bpp"
 
 	.align 2
@@ -11174,7 +11174,7 @@ gFile_graphics_pokemon_palettes_aron_shiny_palette:: @ 8E24A08
 	.incbin "graphics/pokemon/aron/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_aron_icon:: @ 8E24A30
+gMonIcon_Aron:: @ 8E24A30
 	.incbin "graphics/pokemon/aron/icon.4bpp"
 
 	.align 2
@@ -11198,7 +11198,7 @@ gFile_graphics_pokemon_palettes_lairon_shiny_palette:: @ 8E25530
 	.incbin "graphics/pokemon/lairon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_lairon_icon:: @ 8E25558
+gMonIcon_Lairon:: @ 8E25558
 	.incbin "graphics/pokemon/lairon/icon.4bpp"
 
 	.align 2
@@ -11222,7 +11222,7 @@ gFile_graphics_pokemon_palettes_aggron_shiny_palette:: @ 8E26344
 	.incbin "graphics/pokemon/aggron/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_aggron_icon:: @ 8E2636C
+gMonIcon_Aggron:: @ 8E2636C
 	.incbin "graphics/pokemon/aggron/icon.4bpp"
 
 	.align 2
@@ -11246,7 +11246,7 @@ gFile_graphics_pokemon_palettes_castform_shiny_palette:: @ 8E27C50
 	.incbin "graphics/pokemon/castform/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_castform_icon:: @ 8E27CCC
+gMonIcon_Castform:: @ 8E27CCC
 	.incbin "graphics/pokemon/castform/icon.4bpp"
 
 	.align 2
@@ -11270,7 +11270,7 @@ gFile_graphics_pokemon_palettes_volbeat_shiny_palette:: @ 8E28804
 	.incbin "graphics/pokemon/volbeat/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_volbeat_icon:: @ 8E2882C
+gMonIcon_Volbeat:: @ 8E2882C
 	.incbin "graphics/pokemon/volbeat/icon.4bpp"
 
 	.align 2
@@ -11294,7 +11294,7 @@ gFile_graphics_pokemon_palettes_illumise_shiny_palette:: @ 8E29304
 	.incbin "graphics/pokemon/illumise/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_illumise_icon:: @ 8E2932C
+gMonIcon_Illumise:: @ 8E2932C
 	.incbin "graphics/pokemon/illumise/icon.4bpp"
 
 	.align 2
@@ -11318,7 +11318,7 @@ gFile_graphics_pokemon_palettes_lileep_shiny_palette:: @ 8E29DFC
 	.incbin "graphics/pokemon/lileep/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_lileep_icon:: @ 8E29E24
+gMonIcon_Lileep:: @ 8E29E24
 	.incbin "graphics/pokemon/lileep/icon.4bpp"
 
 	.align 2
@@ -11342,7 +11342,7 @@ gFile_graphics_pokemon_palettes_cradily_shiny_palette:: @ 8E2AA84
 	.incbin "graphics/pokemon/cradily/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_cradily_icon:: @ 8E2AAAC
+gMonIcon_Cradily:: @ 8E2AAAC
 	.incbin "graphics/pokemon/cradily/icon.4bpp"
 
 	.align 2
@@ -11366,7 +11366,7 @@ gFile_graphics_pokemon_palettes_anorith_shiny_palette:: @ 8E2B460
 	.incbin "graphics/pokemon/anorith/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_anorith_icon:: @ 8E2B488
+gMonIcon_Anorith:: @ 8E2B488
 	.incbin "graphics/pokemon/anorith/icon.4bpp"
 
 	.align 2
@@ -11390,7 +11390,7 @@ gFile_graphics_pokemon_palettes_armaldo_shiny_palette:: @ 8E2C288
 	.incbin "graphics/pokemon/armaldo/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_armaldo_icon:: @ 8E2C2B0
+gMonIcon_Armaldo:: @ 8E2C2B0
 	.incbin "graphics/pokemon/armaldo/icon.4bpp"
 
 	.align 2
@@ -11414,7 +11414,7 @@ gFile_graphics_pokemon_palettes_ralts_shiny_palette:: @ 8E2CB64
 	.incbin "graphics/pokemon/ralts/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_ralts_icon:: @ 8E2CB8C
+gMonIcon_Ralts:: @ 8E2CB8C
 	.incbin "graphics/pokemon/ralts/icon.4bpp"
 
 	.align 2
@@ -11438,7 +11438,7 @@ gFile_graphics_pokemon_palettes_kirlia_shiny_palette:: @ 8E2D644
 	.incbin "graphics/pokemon/kirlia/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_kirlia_icon:: @ 8E2D66C
+gMonIcon_Kirlia:: @ 8E2D66C
 	.incbin "graphics/pokemon/kirlia/icon.4bpp"
 
 	.align 2
@@ -11462,7 +11462,7 @@ gFile_graphics_pokemon_palettes_gardevoir_shiny_palette:: @ 8E2E164
 	.incbin "graphics/pokemon/gardevoir/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_gardevoir_icon:: @ 8E2E18C
+gMonIcon_Gardevoir:: @ 8E2E18C
 	.incbin "graphics/pokemon/gardevoir/icon.4bpp"
 
 	.align 2
@@ -11486,7 +11486,7 @@ gFile_graphics_pokemon_palettes_bagon_shiny_palette:: @ 8E2EB34
 	.incbin "graphics/pokemon/bagon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_bagon_icon:: @ 8E2EB5C
+gMonIcon_Bagon:: @ 8E2EB5C
 	.incbin "graphics/pokemon/bagon/icon.4bpp"
 
 	.align 2
@@ -11510,7 +11510,7 @@ gFile_graphics_pokemon_palettes_shelgon_shiny_palette:: @ 8E2F590
 	.incbin "graphics/pokemon/shelgon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_shelgon_icon:: @ 8E2F5B8
+gMonIcon_Shelgon:: @ 8E2F5B8
 	.incbin "graphics/pokemon/shelgon/icon.4bpp"
 
 	.align 2
@@ -11534,7 +11534,7 @@ gFile_graphics_pokemon_palettes_salamence_shiny_palette:: @ 8E30148
 	.incbin "graphics/pokemon/salamence/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_salamence_icon:: @ 8E30170
+gMonIcon_Salamence:: @ 8E30170
 	.incbin "graphics/pokemon/salamence/icon.4bpp"
 
 	.align 2
@@ -11558,7 +11558,7 @@ gFile_graphics_pokemon_palettes_beldum_shiny_palette:: @ 8E30B18
 	.incbin "graphics/pokemon/beldum/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_beldum_icon:: @ 8E30B40
+gMonIcon_Beldum:: @ 8E30B40
 	.incbin "graphics/pokemon/beldum/icon.4bpp"
 
 	.align 2
@@ -11582,7 +11582,7 @@ gFile_graphics_pokemon_palettes_metang_shiny_palette:: @ 8E31708
 	.incbin "graphics/pokemon/metang/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_metang_icon:: @ 8E31730
+gMonIcon_Metang:: @ 8E31730
 	.incbin "graphics/pokemon/metang/icon.4bpp"
 
 	.align 2
@@ -11606,7 +11606,7 @@ gFile_graphics_pokemon_palettes_metagross_shiny_palette:: @ 8E322A8
 	.incbin "graphics/pokemon/metagross/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_metagross_icon:: @ 8E322D0
+gMonIcon_Metagross:: @ 8E322D0
 	.incbin "graphics/pokemon/metagross/icon.4bpp"
 
 	.align 2
@@ -11630,7 +11630,7 @@ gFile_graphics_pokemon_palettes_regirock_shiny_palette:: @ 8E33020
 	.incbin "graphics/pokemon/regirock/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_regirock_icon:: @ 8E33048
+gMonIcon_Regirock:: @ 8E33048
 	.incbin "graphics/pokemon/regirock/icon.4bpp"
 
 	.align 2
@@ -11654,7 +11654,7 @@ gFile_graphics_pokemon_palettes_regice_shiny_palette:: @ 8E33BC8
 	.incbin "graphics/pokemon/regice/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_regice_icon:: @ 8E33BF0
+gMonIcon_Regice:: @ 8E33BF0
 	.incbin "graphics/pokemon/regice/icon.4bpp"
 
 	.align 2
@@ -11678,7 +11678,7 @@ gFile_graphics_pokemon_palettes_registeel_shiny_palette:: @ 8E347F8
 	.incbin "graphics/pokemon/registeel/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_registeel_icon:: @ 8E34820
+gMonIcon_Registeel:: @ 8E34820
 	.incbin "graphics/pokemon/registeel/icon.4bpp"
 
 	.align 2
@@ -11702,7 +11702,7 @@ gFile_graphics_pokemon_palettes_kyogre_shiny_palette:: @ 8E35350
 	.incbin "graphics/pokemon/kyogre/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_kyogre_icon:: @ 8E35378
+gMonIcon_Kyogre:: @ 8E35378
 	.incbin "graphics/pokemon/kyogre/icon.4bpp"
 
 	.align 2
@@ -11726,7 +11726,7 @@ gFile_graphics_pokemon_palettes_groudon_shiny_palette:: @ 8E361BC
 	.incbin "graphics/pokemon/groudon/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_groudon_icon:: @ 8E361E4
+gMonIcon_Groudon:: @ 8E361E4
 	.incbin "graphics/pokemon/groudon/icon.4bpp"
 
 	.align 2
@@ -11750,7 +11750,7 @@ gFile_graphics_pokemon_palettes_rayquaza_shiny_palette:: @ 8E36E74
 	.incbin "graphics/pokemon/rayquaza/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_rayquaza_icon:: @ 8E36E9C
+gMonIcon_Rayquaza:: @ 8E36E9C
 	.incbin "graphics/pokemon/rayquaza/icon.4bpp"
 
 	.align 2
@@ -11774,7 +11774,7 @@ gFile_graphics_pokemon_palettes_latias_shiny_palette:: @ 8E37A04
 	.incbin "graphics/pokemon/latias/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_latias_icon:: @ 8E37A2C
+gMonIcon_Latias:: @ 8E37A2C
 	.incbin "graphics/pokemon/latias/icon.4bpp"
 
 	.align 2
@@ -11798,7 +11798,7 @@ gFile_graphics_pokemon_palettes_latios_shiny_palette:: @ 8E38628
 	.incbin "graphics/pokemon/latios/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_latios_icon:: @ 8E38650
+gMonIcon_Latios:: @ 8E38650
 	.incbin "graphics/pokemon/latios/icon.4bpp"
 
 	.align 2
@@ -11822,7 +11822,7 @@ gFile_graphics_pokemon_palettes_jirachi_shiny_palette:: @ 8E39144
 	.incbin "graphics/pokemon/jirachi/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_jirachi_icon:: @ 8E3916C
+gMonIcon_Jirachi:: @ 8E3916C
 	.incbin "graphics/pokemon/jirachi/icon.4bpp"
 
 	.align 2
@@ -11846,11 +11846,9 @@ gFile_graphics_pokemon_palettes_deoxys_shiny_palette:: @ 8E3A360
 	.incbin "graphics/pokemon/deoxys/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_deoxys_icon:: @ 8E3A388
+gMonIcon_Deoxys:: @ 8E3A388
 	.incbin "graphics/pokemon/deoxys/icon.4bpp"
-
-	.align 2
-gFile_graphics_pokemon_icons_deoxys_speed_icon:: @ 8E3A788
+	@ Referenced as part of the same array as normal deoxys
 	.incbin "graphics/pokemon/deoxys/speed_icon.4bpp"
 
 	.align 2
@@ -11874,7 +11872,7 @@ gFile_graphics_pokemon_palettes_chimecho_shiny_palette:: @ 8E3B090
 	.incbin "graphics/pokemon/chimecho/shiny.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_chimecho_icon:: @ 8E3B0B8
+gMonIcon_Chimecho:: @ 8E3B0B8
 	.incbin "graphics/pokemon/chimecho/icon.4bpp"
 
 	.align 2
@@ -11898,7 +11896,7 @@ gFile_graphics_pokemon_back_pics_unown_b_back_pic:: @ 8E3B884
 	.incbin "graphics/pokemon/unown/b/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_B_icon:: @ 8E3BA88
+gMonIcon_Unown_B:: @ 8E3BA88
 	.incbin "graphics/pokemon/unown/b/icon.4bpp"
 
 	.align 2
@@ -11910,7 +11908,7 @@ gFile_graphics_pokemon_back_pics_unown_c_back_pic:: @ 8E3C09C
 	.incbin "graphics/pokemon/unown/c/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_C_icon:: @ 8E3C348
+gMonIcon_Unown_C:: @ 8E3C348
 	.incbin "graphics/pokemon/unown/c/icon.4bpp"
 
 	.align 2
@@ -11922,7 +11920,7 @@ gFile_graphics_pokemon_back_pics_unown_d_back_pic:: @ 8E3C940
 	.incbin "graphics/pokemon/unown/d/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_D_icon:: @ 8E3CB98
+gMonIcon_Unown_D:: @ 8E3CB98
 	.incbin "graphics/pokemon/unown/d/icon.4bpp"
 
 	.align 2
@@ -11934,7 +11932,7 @@ gFile_graphics_pokemon_back_pics_unown_e_back_pic:: @ 8E3D150
 	.incbin "graphics/pokemon/unown/e/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_E_icon:: @ 8E3D350
+gMonIcon_Unown_E:: @ 8E3D350
 	.incbin "graphics/pokemon/unown/e/icon.4bpp"
 
 	.align 2
@@ -11946,7 +11944,7 @@ gFile_graphics_pokemon_back_pics_unown_f_back_pic:: @ 8E3D944
 	.incbin "graphics/pokemon/unown/f/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_F_icon:: @ 8E3DB60
+gMonIcon_Unown_F:: @ 8E3DB60
 	.incbin "graphics/pokemon/unown/f/icon.4bpp"
 
 	.align 2
@@ -11958,7 +11956,7 @@ gFile_graphics_pokemon_back_pics_unown_g_back_pic:: @ 8E3E13C
 	.incbin "graphics/pokemon/unown/g/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_G_icon:: @ 8E3E388
+gMonIcon_Unown_G:: @ 8E3E388
 	.incbin "graphics/pokemon/unown/g/icon.4bpp"
 
 	.align 2
@@ -11970,7 +11968,7 @@ gFile_graphics_pokemon_back_pics_unown_h_back_pic:: @ 8E3E9CC
 	.incbin "graphics/pokemon/unown/h/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_H_icon:: @ 8E3EC90
+gMonIcon_Unown_H:: @ 8E3EC90
 	.incbin "graphics/pokemon/unown/h/icon.4bpp"
 
 	.align 2
@@ -11982,7 +11980,7 @@ gFile_graphics_pokemon_back_pics_unown_i_back_pic:: @ 8E3F228
 	.incbin "graphics/pokemon/unown/i/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_I_icon:: @ 8E3F3D0
+gMonIcon_Unown_I:: @ 8E3F3D0
 	.incbin "graphics/pokemon/unown/i/icon.4bpp"
 
 	.align 2
@@ -11994,7 +11992,7 @@ gFile_graphics_pokemon_back_pics_unown_j_back_pic:: @ 8E3F994
 	.incbin "graphics/pokemon/unown/j/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_J_icon:: @ 8E3FB7C
+gMonIcon_Unown_J:: @ 8E3FB7C
 	.incbin "graphics/pokemon/unown/j/icon.4bpp"
 
 	.align 2
@@ -12006,7 +12004,7 @@ gFile_graphics_pokemon_back_pics_unown_k_back_pic:: @ 8E4014C
 	.incbin "graphics/pokemon/unown/k/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_K_icon:: @ 8E40344
+gMonIcon_Unown_K:: @ 8E40344
 	.incbin "graphics/pokemon/unown/k/icon.4bpp"
 
 	.align 2
@@ -12018,7 +12016,7 @@ gFile_graphics_pokemon_back_pics_unown_l_back_pic:: @ 8E408F4
 	.incbin "graphics/pokemon/unown/l/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_L_icon:: @ 8E40AC8
+gMonIcon_Unown_L:: @ 8E40AC8
 	.incbin "graphics/pokemon/unown/l/icon.4bpp"
 
 	.align 2
@@ -12030,7 +12028,7 @@ gFile_graphics_pokemon_back_pics_unown_m_back_pic:: @ 8E410EC
 	.incbin "graphics/pokemon/unown/m/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_M_icon:: @ 8E41394
+gMonIcon_Unown_M:: @ 8E41394
 	.incbin "graphics/pokemon/unown/m/icon.4bpp"
 
 	.align 2
@@ -12042,7 +12040,7 @@ gFile_graphics_pokemon_back_pics_unown_n_back_pic:: @ 8E4198C
 	.incbin "graphics/pokemon/unown/n/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_N_icon:: @ 8E41BF8
+gMonIcon_Unown_N:: @ 8E41BF8
 	.incbin "graphics/pokemon/unown/n/icon.4bpp"
 
 	.align 2
@@ -12054,7 +12052,7 @@ gFile_graphics_pokemon_back_pics_unown_o_back_pic:: @ 8E42230
 	.incbin "graphics/pokemon/unown/o/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_O_icon:: @ 8E424F0
+gMonIcon_Unown_O:: @ 8E424F0
 	.incbin "graphics/pokemon/unown/o/icon.4bpp"
 
 	.align 2
@@ -12066,7 +12064,7 @@ gFile_graphics_pokemon_back_pics_unown_p_back_pic:: @ 8E42A90
 	.incbin "graphics/pokemon/unown/p/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_P_icon:: @ 8E42C54
+gMonIcon_Unown_P:: @ 8E42C54
 	.incbin "graphics/pokemon/unown/p/icon.4bpp"
 
 	.align 2
@@ -12078,7 +12076,7 @@ gFile_graphics_pokemon_back_pics_unown_q_back_pic:: @ 8E43208
 	.incbin "graphics/pokemon/unown/q/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_Q_icon:: @ 8E433D4
+gMonIcon_Unown_Q:: @ 8E433D4
 	.incbin "graphics/pokemon/unown/q/icon.4bpp"
 
 	.align 2
@@ -12090,7 +12088,7 @@ gFile_graphics_pokemon_back_pics_unown_r_back_pic:: @ 8E43978
 	.incbin "graphics/pokemon/unown/r/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_R_icon:: @ 8E43B40
+gMonIcon_Unown_R:: @ 8E43B40
 	.incbin "graphics/pokemon/unown/r/icon.4bpp"
 
 	.align 2
@@ -12102,7 +12100,7 @@ gFile_graphics_pokemon_back_pics_unown_s_back_pic:: @ 8E44128
 	.incbin "graphics/pokemon/unown/s/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_S_icon:: @ 8E4437C
+gMonIcon_Unown_S:: @ 8E4437C
 	.incbin "graphics/pokemon/unown/s/icon.4bpp"
 
 	.align 2
@@ -12114,7 +12112,7 @@ gFile_graphics_pokemon_back_pics_unown_t_back_pic:: @ 8E4492C
 	.incbin "graphics/pokemon/unown/t/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_T_icon:: @ 8E44AE0
+gMonIcon_Unown_T:: @ 8E44AE0
 	.incbin "graphics/pokemon/unown/t/icon.4bpp"
 
 	.align 2
@@ -12126,7 +12124,7 @@ gFile_graphics_pokemon_back_pics_unown_u_back_pic:: @ 8E450F8
 	.incbin "graphics/pokemon/unown/u/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_U_icon:: @ 8E4534C
+gMonIcon_Unown_U:: @ 8E4534C
 	.incbin "graphics/pokemon/unown/u/icon.4bpp"
 
 	.align 2
@@ -12138,7 +12136,7 @@ gFile_graphics_pokemon_back_pics_unown_v_back_pic:: @ 8E45930
 	.incbin "graphics/pokemon/unown/v/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_V_icon:: @ 8E45B60
+gMonIcon_Unown_V:: @ 8E45B60
 	.incbin "graphics/pokemon/unown/v/icon.4bpp"
 
 	.align 2
@@ -12150,7 +12148,7 @@ gFile_graphics_pokemon_back_pics_unown_w_back_pic:: @ 8E46134
 	.incbin "graphics/pokemon/unown/w/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_W_icon:: @ 8E46338
+gMonIcon_Unown_W:: @ 8E46338
 	.incbin "graphics/pokemon/unown/w/icon.4bpp"
 
 	.align 2
@@ -12162,7 +12160,7 @@ gFile_graphics_pokemon_back_pics_unown_x_back_pic:: @ 8E468FC
 	.incbin "graphics/pokemon/unown/x/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_X_icon:: @ 8E46AEC
+gMonIcon_Unown_X:: @ 8E46AEC
 	.incbin "graphics/pokemon/unown/x/icon.4bpp"
 
 	.align 2
@@ -12174,7 +12172,7 @@ gFile_graphics_pokemon_back_pics_unown_y_back_pic:: @ 8E470C4
 	.incbin "graphics/pokemon/unown/y/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_Y_icon:: @ 8E472B8
+gMonIcon_Unown_Y:: @ 8E472B8
 	.incbin "graphics/pokemon/unown/y/icon.4bpp"
 
 	.align 2
@@ -12186,7 +12184,7 @@ gFile_graphics_pokemon_back_pics_unown_z_back_pic:: @ 8E47868
 	.incbin "graphics/pokemon/unown/z/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_Z_icon:: @ 8E47A44
+gMonIcon_Unown_Z:: @ 8E47A44
 	.incbin "graphics/pokemon/unown/z/icon.4bpp"
 
 	.align 2
@@ -12198,7 +12196,7 @@ gFile_graphics_pokemon_back_pics_unown_exclamation_mark_back_pic:: @ 8E47FD4
 	.incbin "graphics/pokemon/unown/exclamation_mark/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_exclamation_mark_icon:: @ 8E4819C
+gMonIcon_Unown_ExclamationMark:: @ 8E4819C
 	.incbin "graphics/pokemon/unown/exclamation_mark/icon.4bpp"
 
 	.align 2
@@ -12210,7 +12208,7 @@ gFile_graphics_pokemon_back_pics_unown_question_mark_back_pic:: @ 8E48758
 	.incbin "graphics/pokemon/unown/question_mark/back.4bpp.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_unown_question_mark_icon:: @ 8E48958
+gMonIcon_Unown_QuestionMark:: @ 8E48958
 	.incbin "graphics/pokemon/unown/question_mark/icon.4bpp"
 
 	.align 2
@@ -13438,7 +13436,7 @@ gFile_graphics_trainers_palettes_old_man_back_pic:: @ 8E76F34
 	.incbin "graphics/trainers/palettes/old_man_back_pic.gbapal.lz"
 
 	.align 2
-gFile_graphics_pokemon_icons_question_mark_icon:: @ 8E76F5C
+gMonIcon_QuestionMark:: @ 8E76F5C
 	.incbin "graphics/pokemon/question_mark/icon.4bpp"
 
 	.align 2
@@ -13698,7 +13696,7 @@ gFile_graphics_battle_interface_ball_status_bar_sheet:: @ 8E7BB04
 	.incbin "graphics/battle_interface/ball_status_bar.4bpp.lz"
 	
 	.align 2
-gUnknown_8E7BBB8:: @ 8E7BB88
+gMonIcon_Egg:: @ 8E7BB88
 	.incbin "baserom.gba", 0xE7BB88, 0x400 @UNKNOWN
 
 	.align 2
diff --git a/include/graphics.h b/include/graphics.h
index 9af673992..6565d0e80 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -1074,4 +1074,421 @@ extern const u32 gFile_graphics_mail_dream_map_tilemap[];
 extern const u32 gFile_graphics_mail_fab_map_tilemap[];
 extern const u32 gFile_graphics_mail_retro_map_tilemap[];
 
+// pokemon_icons
+extern const u8 gMonIcon_Bulbasaur[];
+extern const u8 gMonIcon_Ivysaur[];
+extern const u8 gMonIcon_Venusaur[];
+extern const u8 gMonIcon_Charmander[];
+extern const u8 gMonIcon_Charmeleon[];
+extern const u8 gMonIcon_Charizard[];
+extern const u8 gMonIcon_Squirtle[];
+extern const u8 gMonIcon_Wartortle[];
+extern const u8 gMonIcon_Blastoise[];
+extern const u8 gMonIcon_Caterpie[];
+extern const u8 gMonIcon_Metapod[];
+extern const u8 gMonIcon_Butterfree[];
+extern const u8 gMonIcon_Weedle[];
+extern const u8 gMonIcon_Kakuna[];
+extern const u8 gMonIcon_Beedrill[];
+extern const u8 gMonIcon_Pidgey[];
+extern const u8 gMonIcon_Pidgeotto[];
+extern const u8 gMonIcon_Pidgeot[];
+extern const u8 gMonIcon_Rattata[];
+extern const u8 gMonIcon_Raticate[];
+extern const u8 gMonIcon_Spearow[];
+extern const u8 gMonIcon_Fearow[];
+extern const u8 gMonIcon_Ekans[];
+extern const u8 gMonIcon_Arbok[];
+extern const u8 gMonIcon_Pikachu[];
+extern const u8 gMonIcon_Raichu[];
+extern const u8 gMonIcon_Sandshrew[];
+extern const u8 gMonIcon_Sandslash[];
+extern const u8 gMonIcon_Nidoran_f[];
+extern const u8 gMonIcon_Nidorina[];
+extern const u8 gMonIcon_Nidoqueen[];
+extern const u8 gMonIcon_Nidoran_m[];
+extern const u8 gMonIcon_Nidorino[];
+extern const u8 gMonIcon_Nidoking[];
+extern const u8 gMonIcon_Clefairy[];
+extern const u8 gMonIcon_Clefable[];
+extern const u8 gMonIcon_Vulpix[];
+extern const u8 gMonIcon_Ninetales[];
+extern const u8 gMonIcon_Jigglypuff[];
+extern const u8 gMonIcon_Wigglytuff[];
+extern const u8 gMonIcon_Zubat[];
+extern const u8 gMonIcon_Golbat[];
+extern const u8 gMonIcon_Oddish[];
+extern const u8 gMonIcon_Gloom[];
+extern const u8 gMonIcon_Vileplume[];
+extern const u8 gMonIcon_Paras[];
+extern const u8 gMonIcon_Parasect[];
+extern const u8 gMonIcon_Venonat[];
+extern const u8 gMonIcon_Venomoth[];
+extern const u8 gMonIcon_Diglett[];
+extern const u8 gMonIcon_Dugtrio[];
+extern const u8 gMonIcon_Meowth[];
+extern const u8 gMonIcon_Persian[];
+extern const u8 gMonIcon_Psyduck[];
+extern const u8 gMonIcon_Golduck[];
+extern const u8 gMonIcon_Mankey[];
+extern const u8 gMonIcon_Primeape[];
+extern const u8 gMonIcon_Growlithe[];
+extern const u8 gMonIcon_Arcanine[];
+extern const u8 gMonIcon_Poliwag[];
+extern const u8 gMonIcon_Poliwhirl[];
+extern const u8 gMonIcon_Poliwrath[];
+extern const u8 gMonIcon_Abra[];
+extern const u8 gMonIcon_Kadabra[];
+extern const u8 gMonIcon_Alakazam[];
+extern const u8 gMonIcon_Machop[];
+extern const u8 gMonIcon_Machoke[];
+extern const u8 gMonIcon_Machamp[];
+extern const u8 gMonIcon_Bellsprout[];
+extern const u8 gMonIcon_Weepinbell[];
+extern const u8 gMonIcon_Victreebel[];
+extern const u8 gMonIcon_Tentacool[];
+extern const u8 gMonIcon_Tentacruel[];
+extern const u8 gMonIcon_Geodude[];
+extern const u8 gMonIcon_Graveler[];
+extern const u8 gMonIcon_Golem[];
+extern const u8 gMonIcon_Ponyta[];
+extern const u8 gMonIcon_Rapidash[];
+extern const u8 gMonIcon_Slowpoke[];
+extern const u8 gMonIcon_Slowbro[];
+extern const u8 gMonIcon_Magnemite[];
+extern const u8 gMonIcon_Magneton[];
+extern const u8 gMonIcon_Farfetch_d[];
+extern const u8 gMonIcon_Doduo[];
+extern const u8 gMonIcon_Dodrio[];
+extern const u8 gMonIcon_Seel[];
+extern const u8 gMonIcon_Dewgong[];
+extern const u8 gMonIcon_Grimer[];
+extern const u8 gMonIcon_Muk[];
+extern const u8 gMonIcon_Shellder[];
+extern const u8 gMonIcon_Cloyster[];
+extern const u8 gMonIcon_Gastly[];
+extern const u8 gMonIcon_Haunter[];
+extern const u8 gMonIcon_Gengar[];
+extern const u8 gMonIcon_Onix[];
+extern const u8 gMonIcon_Drowzee[];
+extern const u8 gMonIcon_Hypno[];
+extern const u8 gMonIcon_Krabby[];
+extern const u8 gMonIcon_Kingler[];
+extern const u8 gMonIcon_Voltorb[];
+extern const u8 gMonIcon_Electrode[];
+extern const u8 gMonIcon_Exeggcute[];
+extern const u8 gMonIcon_Exeggutor[];
+extern const u8 gMonIcon_Cubone[];
+extern const u8 gMonIcon_Marowak[];
+extern const u8 gMonIcon_Hitmonlee[];
+extern const u8 gMonIcon_Hitmonchan[];
+extern const u8 gMonIcon_Lickitung[];
+extern const u8 gMonIcon_Koffing[];
+extern const u8 gMonIcon_Weezing[];
+extern const u8 gMonIcon_Rhyhorn[];
+extern const u8 gMonIcon_Rhydon[];
+extern const u8 gMonIcon_Chansey[];
+extern const u8 gMonIcon_Tangela[];
+extern const u8 gMonIcon_Kangaskhan[];
+extern const u8 gMonIcon_Horsea[];
+extern const u8 gMonIcon_Seadra[];
+extern const u8 gMonIcon_Goldeen[];
+extern const u8 gMonIcon_Seaking[];
+extern const u8 gMonIcon_Staryu[];
+extern const u8 gMonIcon_Starmie[];
+extern const u8 gMonIcon_Mr_Mime[];
+extern const u8 gMonIcon_Scyther[];
+extern const u8 gMonIcon_Jynx[];
+extern const u8 gMonIcon_Electabuzz[];
+extern const u8 gMonIcon_Magmar[];
+extern const u8 gMonIcon_Pinsir[];
+extern const u8 gMonIcon_Tauros[];
+extern const u8 gMonIcon_Magikarp[];
+extern const u8 gMonIcon_Gyarados[];
+extern const u8 gMonIcon_Lapras[];
+extern const u8 gMonIcon_Ditto[];
+extern const u8 gMonIcon_Eevee[];
+extern const u8 gMonIcon_Vaporeon[];
+extern const u8 gMonIcon_Jolteon[];
+extern const u8 gMonIcon_Flareon[];
+extern const u8 gMonIcon_Porygon[];
+extern const u8 gMonIcon_Omanyte[];
+extern const u8 gMonIcon_Omastar[];
+extern const u8 gMonIcon_Kabuto[];
+extern const u8 gMonIcon_Kabutops[];
+extern const u8 gMonIcon_Aerodactyl[];
+extern const u8 gMonIcon_Snorlax[];
+extern const u8 gMonIcon_Articuno[];
+extern const u8 gMonIcon_Zapdos[];
+extern const u8 gMonIcon_Moltres[];
+extern const u8 gMonIcon_Dratini[];
+extern const u8 gMonIcon_Dragonair[];
+extern const u8 gMonIcon_Dragonite[];
+extern const u8 gMonIcon_Mewtwo[];
+extern const u8 gMonIcon_Mew[];
+extern const u8 gMonIcon_Chikorita[];
+extern const u8 gMonIcon_Bayleef[];
+extern const u8 gMonIcon_Meganium[];
+extern const u8 gMonIcon_Cyndaquil[];
+extern const u8 gMonIcon_Quilava[];
+extern const u8 gMonIcon_Typhlosion[];
+extern const u8 gMonIcon_Totodile[];
+extern const u8 gMonIcon_Croconaw[];
+extern const u8 gMonIcon_Feraligatr[];
+extern const u8 gMonIcon_Sentret[];
+extern const u8 gMonIcon_Furret[];
+extern const u8 gMonIcon_Hoothoot[];
+extern const u8 gMonIcon_Noctowl[];
+extern const u8 gMonIcon_Ledyba[];
+extern const u8 gMonIcon_Ledian[];
+extern const u8 gMonIcon_Spinarak[];
+extern const u8 gMonIcon_Ariados[];
+extern const u8 gMonIcon_Crobat[];
+extern const u8 gMonIcon_Chinchou[];
+extern const u8 gMonIcon_Lanturn[];
+extern const u8 gMonIcon_Pichu[];
+extern const u8 gMonIcon_Cleffa[];
+extern const u8 gMonIcon_Igglybuff[];
+extern const u8 gMonIcon_Togepi[];
+extern const u8 gMonIcon_Togetic[];
+extern const u8 gMonIcon_Natu[];
+extern const u8 gMonIcon_Xatu[];
+extern const u8 gMonIcon_Mareep[];
+extern const u8 gMonIcon_Flaaffy[];
+extern const u8 gMonIcon_Ampharos[];
+extern const u8 gMonIcon_Bellossom[];
+extern const u8 gMonIcon_Marill[];
+extern const u8 gMonIcon_Azumarill[];
+extern const u8 gMonIcon_Sudowoodo[];
+extern const u8 gMonIcon_Politoed[];
+extern const u8 gMonIcon_Hoppip[];
+extern const u8 gMonIcon_Skiploom[];
+extern const u8 gMonIcon_Jumpluff[];
+extern const u8 gMonIcon_Aipom[];
+extern const u8 gMonIcon_Sunkern[];
+extern const u8 gMonIcon_Sunflora[];
+extern const u8 gMonIcon_Yanma[];
+extern const u8 gMonIcon_Wooper[];
+extern const u8 gMonIcon_Quagsire[];
+extern const u8 gMonIcon_Espeon[];
+extern const u8 gMonIcon_Umbreon[];
+extern const u8 gMonIcon_Murkrow[];
+extern const u8 gMonIcon_Slowking[];
+extern const u8 gMonIcon_Misdreavus[];
+extern const u8 gMonIcon_Unown_A[];
+extern const u8 gMonIcon_Wobbuffet[];
+extern const u8 gMonIcon_Girafarig[];
+extern const u8 gMonIcon_Pineco[];
+extern const u8 gMonIcon_Forretress[];
+extern const u8 gMonIcon_Dunsparce[];
+extern const u8 gMonIcon_Gligar[];
+extern const u8 gMonIcon_Steelix[];
+extern const u8 gMonIcon_Snubbull[];
+extern const u8 gMonIcon_Granbull[];
+extern const u8 gMonIcon_Qwilfish[];
+extern const u8 gMonIcon_Scizor[];
+extern const u8 gMonIcon_Shuckle[];
+extern const u8 gMonIcon_Heracross[];
+extern const u8 gMonIcon_Sneasel[];
+extern const u8 gMonIcon_Teddiursa[];
+extern const u8 gMonIcon_Ursaring[];
+extern const u8 gMonIcon_Slugma[];
+extern const u8 gMonIcon_Magcargo[];
+extern const u8 gMonIcon_Swinub[];
+extern const u8 gMonIcon_Piloswine[];
+extern const u8 gMonIcon_Corsola[];
+extern const u8 gMonIcon_Remoraid[];
+extern const u8 gMonIcon_Octillery[];
+extern const u8 gMonIcon_Delibird[];
+extern const u8 gMonIcon_Mantine[];
+extern const u8 gMonIcon_Skarmory[];
+extern const u8 gMonIcon_Houndour[];
+extern const u8 gMonIcon_Houndoom[];
+extern const u8 gMonIcon_Kingdra[];
+extern const u8 gMonIcon_Phanpy[];
+extern const u8 gMonIcon_Donphan[];
+extern const u8 gMonIcon_Porygon2[];
+extern const u8 gMonIcon_Stantler[];
+extern const u8 gMonIcon_Smeargle[];
+extern const u8 gMonIcon_Tyrogue[];
+extern const u8 gMonIcon_Hitmontop[];
+extern const u8 gMonIcon_Smoochum[];
+extern const u8 gMonIcon_Elekid[];
+extern const u8 gMonIcon_Magby[];
+extern const u8 gMonIcon_Miltank[];
+extern const u8 gMonIcon_Blissey[];
+extern const u8 gMonIcon_Raikou[];
+extern const u8 gMonIcon_Entei[];
+extern const u8 gMonIcon_Suicune[];
+extern const u8 gMonIcon_Larvitar[];
+extern const u8 gMonIcon_Pupitar[];
+extern const u8 gMonIcon_Tyranitar[];
+extern const u8 gMonIcon_Lugia[];
+extern const u8 gMonIcon_Ho_Oh[];
+extern const u8 gMonIcon_Celebi[];
+extern const u8 gMonIcon_Treecko[];
+extern const u8 gMonIcon_Grovyle[];
+extern const u8 gMonIcon_Sceptile[];
+extern const u8 gMonIcon_Torchic[];
+extern const u8 gMonIcon_Combusken[];
+extern const u8 gMonIcon_Blaziken[];
+extern const u8 gMonIcon_Mudkip[];
+extern const u8 gMonIcon_Marshtomp[];
+extern const u8 gMonIcon_Swampert[];
+extern const u8 gMonIcon_Poochyena[];
+extern const u8 gMonIcon_Mightyena[];
+extern const u8 gMonIcon_Zigzagoon[];
+extern const u8 gMonIcon_Linoone[];
+extern const u8 gMonIcon_Wurmple[];
+extern const u8 gMonIcon_Silcoon[];
+extern const u8 gMonIcon_Beautifly[];
+extern const u8 gMonIcon_Cascoon[];
+extern const u8 gMonIcon_Dustox[];
+extern const u8 gMonIcon_Lotad[];
+extern const u8 gMonIcon_Lombre[];
+extern const u8 gMonIcon_Ludicolo[];
+extern const u8 gMonIcon_Seedot[];
+extern const u8 gMonIcon_Nuzleaf[];
+extern const u8 gMonIcon_Shiftry[];
+extern const u8 gMonIcon_Nincada[];
+extern const u8 gMonIcon_Ninjask[];
+extern const u8 gMonIcon_Shedinja[];
+extern const u8 gMonIcon_Taillow[];
+extern const u8 gMonIcon_Swellow[];
+extern const u8 gMonIcon_Shroomish[];
+extern const u8 gMonIcon_Breloom[];
+extern const u8 gMonIcon_Spinda[];
+extern const u8 gMonIcon_Wingull[];
+extern const u8 gMonIcon_Pelipper[];
+extern const u8 gMonIcon_Surskit[];
+extern const u8 gMonIcon_Masquerain[];
+extern const u8 gMonIcon_Wailmer[];
+extern const u8 gMonIcon_Wailord[];
+extern const u8 gMonIcon_Skitty[];
+extern const u8 gMonIcon_Delcatty[];
+extern const u8 gMonIcon_Kecleon[];
+extern const u8 gMonIcon_Baltoy[];
+extern const u8 gMonIcon_Claydol[];
+extern const u8 gMonIcon_Nosepass[];
+extern const u8 gMonIcon_Torkoal[];
+extern const u8 gMonIcon_Sableye[];
+extern const u8 gMonIcon_Barboach[];
+extern const u8 gMonIcon_Whiscash[];
+extern const u8 gMonIcon_Luvdisc[];
+extern const u8 gMonIcon_Corphish[];
+extern const u8 gMonIcon_Crawdaunt[];
+extern const u8 gMonIcon_Feebas[];
+extern const u8 gMonIcon_Milotic[];
+extern const u8 gMonIcon_Carvanha[];
+extern const u8 gMonIcon_Sharpedo[];
+extern const u8 gMonIcon_Trapinch[];
+extern const u8 gMonIcon_Vibrava[];
+extern const u8 gMonIcon_Flygon[];
+extern const u8 gMonIcon_Makuhita[];
+extern const u8 gMonIcon_Hariyama[];
+extern const u8 gMonIcon_Electrike[];
+extern const u8 gMonIcon_Manectric[];
+extern const u8 gMonIcon_Numel[];
+extern const u8 gMonIcon_Camerupt[];
+extern const u8 gMonIcon_Spheal[];
+extern const u8 gMonIcon_Sealeo[];
+extern const u8 gMonIcon_Walrein[];
+extern const u8 gMonIcon_Cacnea[];
+extern const u8 gMonIcon_Cacturne[];
+extern const u8 gMonIcon_Snorunt[];
+extern const u8 gMonIcon_Glalie[];
+extern const u8 gMonIcon_Lunatone[];
+extern const u8 gMonIcon_Solrock[];
+extern const u8 gMonIcon_Azurill[];
+extern const u8 gMonIcon_Spoink[];
+extern const u8 gMonIcon_Grumpig[];
+extern const u8 gMonIcon_Plusle[];
+extern const u8 gMonIcon_Minun[];
+extern const u8 gMonIcon_Mawile[];
+extern const u8 gMonIcon_Meditite[];
+extern const u8 gMonIcon_Medicham[];
+extern const u8 gMonIcon_Swablu[];
+extern const u8 gMonIcon_Altaria[];
+extern const u8 gMonIcon_Wynaut[];
+extern const u8 gMonIcon_Duskull[];
+extern const u8 gMonIcon_Dusclops[];
+extern const u8 gMonIcon_Roselia[];
+extern const u8 gMonIcon_Slakoth[];
+extern const u8 gMonIcon_Vigoroth[];
+extern const u8 gMonIcon_Slaking[];
+extern const u8 gMonIcon_Gulpin[];
+extern const u8 gMonIcon_Swalot[];
+extern const u8 gMonIcon_Tropius[];
+extern const u8 gMonIcon_Whismur[];
+extern const u8 gMonIcon_Loudred[];
+extern const u8 gMonIcon_Exploud[];
+extern const u8 gMonIcon_Clamperl[];
+extern const u8 gMonIcon_Huntail[];
+extern const u8 gMonIcon_Gorebyss[];
+extern const u8 gMonIcon_Absol[];
+extern const u8 gMonIcon_Shuppet[];
+extern const u8 gMonIcon_Banette[];
+extern const u8 gMonIcon_Seviper[];
+extern const u8 gMonIcon_Zangoose[];
+extern const u8 gMonIcon_Relicanth[];
+extern const u8 gMonIcon_Aron[];
+extern const u8 gMonIcon_Lairon[];
+extern const u8 gMonIcon_Aggron[];
+extern const u8 gMonIcon_Castform[];
+extern const u8 gMonIcon_Volbeat[];
+extern const u8 gMonIcon_Illumise[];
+extern const u8 gMonIcon_Lileep[];
+extern const u8 gMonIcon_Cradily[];
+extern const u8 gMonIcon_Anorith[];
+extern const u8 gMonIcon_Armaldo[];
+extern const u8 gMonIcon_Ralts[];
+extern const u8 gMonIcon_Kirlia[];
+extern const u8 gMonIcon_Gardevoir[];
+extern const u8 gMonIcon_Bagon[];
+extern const u8 gMonIcon_Shelgon[];
+extern const u8 gMonIcon_Salamence[];
+extern const u8 gMonIcon_Beldum[];
+extern const u8 gMonIcon_Metang[];
+extern const u8 gMonIcon_Metagross[];
+extern const u8 gMonIcon_Regirock[];
+extern const u8 gMonIcon_Regice[];
+extern const u8 gMonIcon_Registeel[];
+extern const u8 gMonIcon_Kyogre[];
+extern const u8 gMonIcon_Groudon[];
+extern const u8 gMonIcon_Rayquaza[];
+extern const u8 gMonIcon_Latias[];
+extern const u8 gMonIcon_Latios[];
+extern const u8 gMonIcon_Jirachi[];
+extern const u8 gMonIcon_Deoxys[];
+extern const u8 gMonIcon_Chimecho[];
+extern const u8 gMonIcon_Egg[];
+extern const u8 gMonIcon_Unown_B[];
+extern const u8 gMonIcon_Unown_C[];
+extern const u8 gMonIcon_Unown_D[];
+extern const u8 gMonIcon_Unown_E[];
+extern const u8 gMonIcon_Unown_F[];
+extern const u8 gMonIcon_Unown_G[];
+extern const u8 gMonIcon_Unown_H[];
+extern const u8 gMonIcon_Unown_I[];
+extern const u8 gMonIcon_Unown_J[];
+extern const u8 gMonIcon_Unown_K[];
+extern const u8 gMonIcon_Unown_L[];
+extern const u8 gMonIcon_Unown_M[];
+extern const u8 gMonIcon_Unown_N[];
+extern const u8 gMonIcon_Unown_O[];
+extern const u8 gMonIcon_Unown_P[];
+extern const u8 gMonIcon_Unown_Q[];
+extern const u8 gMonIcon_Unown_R[];
+extern const u8 gMonIcon_Unown_S[];
+extern const u8 gMonIcon_Unown_T[];
+extern const u8 gMonIcon_Unown_U[];
+extern const u8 gMonIcon_Unown_V[];
+extern const u8 gMonIcon_Unown_W[];
+extern const u8 gMonIcon_Unown_X[];
+extern const u8 gMonIcon_Unown_Y[];
+extern const u8 gMonIcon_Unown_Z[];
+extern const u8 gMonIcon_Unown_ExclamationMark[];
+extern const u8 gMonIcon_Unown_QuestionMark[];
+extern const u8 gMonIcon_QuestionMark[];
+
 #endif //GUARD_GRAPHICS_H
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index d5aab71de..52d374041 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -4,20 +4,21 @@
 #include "global.h"
 
 const u8 *GetMonIconPtr(u16 speciesId, u32 personality, u32 frameNo);
+const u8 *GetMonIconTiles(u16 iconSpecies, bool32 extra);
 const u16 *GetValidMonIconPalettePtr(u16 speciesId);
 u16 sub_80D2E84(u16 speciesId);
 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);
-u8 sub_8096ECC(u16, void (*)(struct Sprite *), s16, s16, u8, bool32);
-void sub_8097070(struct Sprite *);
+u16 MailSpeciesToIconSpecies(u16);
+u8 CreateMonIcon_HandleDeoxys(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, bool32 extra);
+void DestroyMonIcon(struct Sprite *);
 u16 GetUnownLetterByPersonality(u32 personality);
 u8 UpdateMonIconFrame(struct Sprite *sprite);
-void sub_80970E0(u16 iconId);
-void sub_8097168(u16 iconId);
+void LoadMonIconPalette(u16 iconId);
+void FreeMonIconPalette(u16 iconId);
 
 #endif // GUARD_POKEMON_ICON_H
diff --git a/ld_script.txt b/ld_script.txt
index ef17deaf6..3850cea14 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -131,7 +131,7 @@ SECTIONS {
         src/pokedex.o(.text);
         asm/trainer_card.o(.text);
         asm/pokemon_storage_system.o(.text);
-        asm/pokemon_icon.o(.text);
+        src/pokemon_icon.o(.text);
         asm/script_movement.o(.text);
         asm/fldeff_cut.o(.text);
         src/mail_data.o(.text);
@@ -421,6 +421,8 @@ SECTIONS {
         src/title_screen.o(.rodata);
         data/field_weather.o(.rodata);
         data/data_835B488.o(.rodata);
+        src/pokemon_icon.o(.rodata);
+        data/data_835B488.o(.rodata.83D4100);
         src/item_menu_icons.o(.rodata);
         src/battle_anim_mon_movement.o(.rodata);
         src/item.o(.rodata);
diff --git a/src/mail.c b/src/mail.c
index f6b7e2c4d..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:
-            sub_80970E0(iconId);
-            sMailViewResources->monIconSpriteId = sub_8096ECC(iconId, SpriteCallbackDummy, 0x60, 0x80, 0, FALSE);
+            LoadMonIconPalette(iconId);
+            sMailViewResources->monIconSpriteId = CreateMonIcon_HandleDeoxys(iconId, SpriteCallbackDummy, 0x60, 0x80, 0, FALSE);
             break;
         case MAIL_ICON_DREAM:
-            sub_80970E0(iconId);
-            sMailViewResources->monIconSpriteId = sub_8096ECC(iconId, SpriteCallbackDummy, 0x28, 0x80, 0, FALSE);
+            LoadMonIconPalette(iconId);
+            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:
-            sub_8097168(sub_8096FD4(sMailViewResources->mail->species));
-            sub_8097070(&gSprites[sMailViewResources->monIconSpriteId]);
+            FreeMonIconPalette(MailSpeciesToIconSpecies(sMailViewResources->mail->species));
+            DestroyMonIcon(&gSprites[sMailViewResources->monIconSpriteId]);
             break;
         }
         *sMailViewResources = (struct MailViewResources){};
diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c
index 85c1dfccb..e42b49627 100644
--- a/src/mevent_8145654.c
+++ b/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]]);
                 }
             }
         }
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
new file mode 100644
index 000000000..b07a46c7d
--- /dev/null
+++ b/src/pokemon_icon.c
@@ -0,0 +1,1284 @@
+#include "global.h"
+#include "palette.h"
+#include "mail_data.h"
+#include "pokemon_icon.h"
+#include "graphics.h"
+#include "constants/species.h"
+
+#define POKE_ICON_BASE_PAL_TAG 56000
+
+struct MonIconSpriteTemplate
+{
+    const struct OamData * oam;
+    const u8 *image;
+    const union AnimCmd *const * anims;
+    const union AffineAnimCmd *const * affineAnims;
+    SpriteCallback callback;
+    u16 paletteTag;
+};
+
+static u8 CreateMonIconSprite(const struct MonIconSpriteTemplate * template, s16 x, s16 y, u8 subpriority);
+static void DestroyMonIconInternal(struct Sprite * sprite);
+
+const u16 gMonIconPalettes[][16] = {
+    INCBIN_U16("graphics/pokemon/icon_palettes/icon_palette_0.gbapal"),
+    INCBIN_U16("graphics/pokemon/icon_palettes/icon_palette_1.gbapal"),
+    INCBIN_U16("graphics/pokemon/icon_palettes/icon_palette_2.gbapal")
+};
+
+const u8 *const gMonIconTable[] = {
+    [SPECIES_NONE]        = gMonIcon_QuestionMark,
+    [SPECIES_BULBASAUR]   = gMonIcon_Bulbasaur,
+    [SPECIES_IVYSAUR]     = gMonIcon_Ivysaur,
+    [SPECIES_VENUSAUR]    = gMonIcon_Venusaur,
+    [SPECIES_CHARMANDER]  = gMonIcon_Charmander,
+    [SPECIES_CHARMELEON]  = gMonIcon_Charmeleon,
+    [SPECIES_CHARIZARD]   = gMonIcon_Charizard,
+    [SPECIES_SQUIRTLE]    = gMonIcon_Squirtle,
+    [SPECIES_WARTORTLE]   = gMonIcon_Wartortle,
+    [SPECIES_BLASTOISE]   = gMonIcon_Blastoise,
+    [SPECIES_CATERPIE]    = gMonIcon_Caterpie,
+    [SPECIES_METAPOD]     = gMonIcon_Metapod,
+    [SPECIES_BUTTERFREE]  = gMonIcon_Butterfree,
+    [SPECIES_WEEDLE]      = gMonIcon_Weedle,
+    [SPECIES_KAKUNA]      = gMonIcon_Kakuna,
+    [SPECIES_BEEDRILL]    = gMonIcon_Beedrill,
+    [SPECIES_PIDGEY]      = gMonIcon_Pidgey,
+    [SPECIES_PIDGEOTTO]   = gMonIcon_Pidgeotto,
+    [SPECIES_PIDGEOT]     = gMonIcon_Pidgeot,
+    [SPECIES_RATTATA]     = gMonIcon_Rattata,
+    [SPECIES_RATICATE]    = gMonIcon_Raticate,
+    [SPECIES_SPEAROW]     = gMonIcon_Spearow,
+    [SPECIES_FEAROW]      = gMonIcon_Fearow,
+    [SPECIES_EKANS]       = gMonIcon_Ekans,
+    [SPECIES_ARBOK]       = gMonIcon_Arbok,
+    [SPECIES_PIKACHU]     = gMonIcon_Pikachu,
+    [SPECIES_RAICHU]      = gMonIcon_Raichu,
+    [SPECIES_SANDSHREW]   = gMonIcon_Sandshrew,
+    [SPECIES_SANDSLASH]   = gMonIcon_Sandslash,
+    [SPECIES_NIDORAN_F]   = gMonIcon_Nidoran_f,
+    [SPECIES_NIDORINA]    = gMonIcon_Nidorina,
+    [SPECIES_NIDOQUEEN]   = gMonIcon_Nidoqueen,
+    [SPECIES_NIDORAN_M]   = gMonIcon_Nidoran_m,
+    [SPECIES_NIDORINO]    = gMonIcon_Nidorino,
+    [SPECIES_NIDOKING]    = gMonIcon_Nidoking,
+    [SPECIES_CLEFAIRY]    = gMonIcon_Clefairy,
+    [SPECIES_CLEFABLE]    = gMonIcon_Clefable,
+    [SPECIES_VULPIX]      = gMonIcon_Vulpix,
+    [SPECIES_NINETALES]   = gMonIcon_Ninetales,
+    [SPECIES_JIGGLYPUFF]  = gMonIcon_Jigglypuff,
+    [SPECIES_WIGGLYTUFF]  = gMonIcon_Wigglytuff,
+    [SPECIES_ZUBAT]       = gMonIcon_Zubat,
+    [SPECIES_GOLBAT]      = gMonIcon_Golbat,
+    [SPECIES_ODDISH]      = gMonIcon_Oddish,
+    [SPECIES_GLOOM]       = gMonIcon_Gloom,
+    [SPECIES_VILEPLUME]   = gMonIcon_Vileplume,
+    [SPECIES_PARAS]       = gMonIcon_Paras,
+    [SPECIES_PARASECT]    = gMonIcon_Parasect,
+    [SPECIES_VENONAT]     = gMonIcon_Venonat,
+    [SPECIES_VENOMOTH]    = gMonIcon_Venomoth,
+    [SPECIES_DIGLETT]     = gMonIcon_Diglett,
+    [SPECIES_DUGTRIO]     = gMonIcon_Dugtrio,
+    [SPECIES_MEOWTH]      = gMonIcon_Meowth,
+    [SPECIES_PERSIAN]     = gMonIcon_Persian,
+    [SPECIES_PSYDUCK]     = gMonIcon_Psyduck,
+    [SPECIES_GOLDUCK]     = gMonIcon_Golduck,
+    [SPECIES_MANKEY]      = gMonIcon_Mankey,
+    [SPECIES_PRIMEAPE]    = gMonIcon_Primeape,
+    [SPECIES_GROWLITHE]   = gMonIcon_Growlithe,
+    [SPECIES_ARCANINE]    = gMonIcon_Arcanine,
+    [SPECIES_POLIWAG]     = gMonIcon_Poliwag,
+    [SPECIES_POLIWHIRL]   = gMonIcon_Poliwhirl,
+    [SPECIES_POLIWRATH]   = gMonIcon_Poliwrath,
+    [SPECIES_ABRA]        = gMonIcon_Abra,
+    [SPECIES_KADABRA]     = gMonIcon_Kadabra,
+    [SPECIES_ALAKAZAM]    = gMonIcon_Alakazam,
+    [SPECIES_MACHOP]      = gMonIcon_Machop,
+    [SPECIES_MACHOKE]     = gMonIcon_Machoke,
+    [SPECIES_MACHAMP]     = gMonIcon_Machamp,
+    [SPECIES_BELLSPROUT]  = gMonIcon_Bellsprout,
+    [SPECIES_WEEPINBELL]  = gMonIcon_Weepinbell,
+    [SPECIES_VICTREEBEL]  = gMonIcon_Victreebel,
+    [SPECIES_TENTACOOL]   = gMonIcon_Tentacool,
+    [SPECIES_TENTACRUEL]  = gMonIcon_Tentacruel,
+    [SPECIES_GEODUDE]     = gMonIcon_Geodude,
+    [SPECIES_GRAVELER]    = gMonIcon_Graveler,
+    [SPECIES_GOLEM]       = gMonIcon_Golem,
+    [SPECIES_PONYTA]      = gMonIcon_Ponyta,
+    [SPECIES_RAPIDASH]    = gMonIcon_Rapidash,
+    [SPECIES_SLOWPOKE]    = gMonIcon_Slowpoke,
+    [SPECIES_SLOWBRO]     = gMonIcon_Slowbro,
+    [SPECIES_MAGNEMITE]   = gMonIcon_Magnemite,
+    [SPECIES_MAGNETON]    = gMonIcon_Magneton,
+    [SPECIES_FARFETCHD]   = gMonIcon_Farfetch_d,
+    [SPECIES_DODUO]       = gMonIcon_Doduo,
+    [SPECIES_DODRIO]      = gMonIcon_Dodrio,
+    [SPECIES_SEEL]        = gMonIcon_Seel,
+    [SPECIES_DEWGONG]     = gMonIcon_Dewgong,
+    [SPECIES_GRIMER]      = gMonIcon_Grimer,
+    [SPECIES_MUK]         = gMonIcon_Muk,
+    [SPECIES_SHELLDER]    = gMonIcon_Shellder,
+    [SPECIES_CLOYSTER]    = gMonIcon_Cloyster,
+    [SPECIES_GASTLY]      = gMonIcon_Gastly,
+    [SPECIES_HAUNTER]     = gMonIcon_Haunter,
+    [SPECIES_GENGAR]      = gMonIcon_Gengar,
+    [SPECIES_ONIX]        = gMonIcon_Onix,
+    [SPECIES_DROWZEE]     = gMonIcon_Drowzee,
+    [SPECIES_HYPNO]       = gMonIcon_Hypno,
+    [SPECIES_KRABBY]      = gMonIcon_Krabby,
+    [SPECIES_KINGLER]     = gMonIcon_Kingler,
+    [SPECIES_VOLTORB]     = gMonIcon_Voltorb,
+    [SPECIES_ELECTRODE]   = gMonIcon_Electrode,
+    [SPECIES_EXEGGCUTE]   = gMonIcon_Exeggcute,
+    [SPECIES_EXEGGUTOR]   = gMonIcon_Exeggutor,
+    [SPECIES_CUBONE]      = gMonIcon_Cubone,
+    [SPECIES_MAROWAK]     = gMonIcon_Marowak,
+    [SPECIES_HITMONLEE]   = gMonIcon_Hitmonlee,
+    [SPECIES_HITMONCHAN]  = gMonIcon_Hitmonchan,
+    [SPECIES_LICKITUNG]   = gMonIcon_Lickitung,
+    [SPECIES_KOFFING]     = gMonIcon_Koffing,
+    [SPECIES_WEEZING]     = gMonIcon_Weezing,
+    [SPECIES_RHYHORN]     = gMonIcon_Rhyhorn,
+    [SPECIES_RHYDON]      = gMonIcon_Rhydon,
+    [SPECIES_CHANSEY]     = gMonIcon_Chansey,
+    [SPECIES_TANGELA]     = gMonIcon_Tangela,
+    [SPECIES_KANGASKHAN]  = gMonIcon_Kangaskhan,
+    [SPECIES_HORSEA]      = gMonIcon_Horsea,
+    [SPECIES_SEADRA]      = gMonIcon_Seadra,
+    [SPECIES_GOLDEEN]     = gMonIcon_Goldeen,
+    [SPECIES_SEAKING]     = gMonIcon_Seaking,
+    [SPECIES_STARYU]      = gMonIcon_Staryu,
+    [SPECIES_STARMIE]     = gMonIcon_Starmie,
+    [SPECIES_MR_MIME]     = gMonIcon_Mr_Mime,
+    [SPECIES_SCYTHER]     = gMonIcon_Scyther,
+    [SPECIES_JYNX]        = gMonIcon_Jynx,
+    [SPECIES_ELECTABUZZ]  = gMonIcon_Electabuzz,
+    [SPECIES_MAGMAR]      = gMonIcon_Magmar,
+    [SPECIES_PINSIR]      = gMonIcon_Pinsir,
+    [SPECIES_TAUROS]      = gMonIcon_Tauros,
+    [SPECIES_MAGIKARP]    = gMonIcon_Magikarp,
+    [SPECIES_GYARADOS]    = gMonIcon_Gyarados,
+    [SPECIES_LAPRAS]      = gMonIcon_Lapras,
+    [SPECIES_DITTO]       = gMonIcon_Ditto,
+    [SPECIES_EEVEE]       = gMonIcon_Eevee,
+    [SPECIES_VAPOREON]    = gMonIcon_Vaporeon,
+    [SPECIES_JOLTEON]     = gMonIcon_Jolteon,
+    [SPECIES_FLAREON]     = gMonIcon_Flareon,
+    [SPECIES_PORYGON]     = gMonIcon_Porygon,
+    [SPECIES_OMANYTE]     = gMonIcon_Omanyte,
+    [SPECIES_OMASTAR]     = gMonIcon_Omastar,
+    [SPECIES_KABUTO]      = gMonIcon_Kabuto,
+    [SPECIES_KABUTOPS]    = gMonIcon_Kabutops,
+    [SPECIES_AERODACTYL]  = gMonIcon_Aerodactyl,
+    [SPECIES_SNORLAX]     = gMonIcon_Snorlax,
+    [SPECIES_ARTICUNO]    = gMonIcon_Articuno,
+    [SPECIES_ZAPDOS]      = gMonIcon_Zapdos,
+    [SPECIES_MOLTRES]     = gMonIcon_Moltres,
+    [SPECIES_DRATINI]     = gMonIcon_Dratini,
+    [SPECIES_DRAGONAIR]   = gMonIcon_Dragonair,
+    [SPECIES_DRAGONITE]   = gMonIcon_Dragonite,
+    [SPECIES_MEWTWO]      = gMonIcon_Mewtwo,
+    [SPECIES_MEW]         = gMonIcon_Mew,
+    [SPECIES_CHIKORITA]   = gMonIcon_Chikorita,
+    [SPECIES_BAYLEEF]     = gMonIcon_Bayleef,
+    [SPECIES_MEGANIUM]    = gMonIcon_Meganium,
+    [SPECIES_CYNDAQUIL]   = gMonIcon_Cyndaquil,
+    [SPECIES_QUILAVA]     = gMonIcon_Quilava,
+    [SPECIES_TYPHLOSION]  = gMonIcon_Typhlosion,
+    [SPECIES_TOTODILE]    = gMonIcon_Totodile,
+    [SPECIES_CROCONAW]    = gMonIcon_Croconaw,
+    [SPECIES_FERALIGATR]  = gMonIcon_Feraligatr,
+    [SPECIES_SENTRET]     = gMonIcon_Sentret,
+    [SPECIES_FURRET]      = gMonIcon_Furret,
+    [SPECIES_HOOTHOOT]    = gMonIcon_Hoothoot,
+    [SPECIES_NOCTOWL]     = gMonIcon_Noctowl,
+    [SPECIES_LEDYBA]      = gMonIcon_Ledyba,
+    [SPECIES_LEDIAN]      = gMonIcon_Ledian,
+    [SPECIES_SPINARAK]    = gMonIcon_Spinarak,
+    [SPECIES_ARIADOS]     = gMonIcon_Ariados,
+    [SPECIES_CROBAT]      = gMonIcon_Crobat,
+    [SPECIES_CHINCHOU]    = gMonIcon_Chinchou,
+    [SPECIES_LANTURN]     = gMonIcon_Lanturn,
+    [SPECIES_PICHU]       = gMonIcon_Pichu,
+    [SPECIES_CLEFFA]      = gMonIcon_Cleffa,
+    [SPECIES_IGGLYBUFF]   = gMonIcon_Igglybuff,
+    [SPECIES_TOGEPI]      = gMonIcon_Togepi,
+    [SPECIES_TOGETIC]     = gMonIcon_Togetic,
+    [SPECIES_NATU]        = gMonIcon_Natu,
+    [SPECIES_XATU]        = gMonIcon_Xatu,
+    [SPECIES_MAREEP]      = gMonIcon_Mareep,
+    [SPECIES_FLAAFFY]     = gMonIcon_Flaaffy,
+    [SPECIES_AMPHAROS]    = gMonIcon_Ampharos,
+    [SPECIES_BELLOSSOM]   = gMonIcon_Bellossom,
+    [SPECIES_MARILL]      = gMonIcon_Marill,
+    [SPECIES_AZUMARILL]   = gMonIcon_Azumarill,
+    [SPECIES_SUDOWOODO]   = gMonIcon_Sudowoodo,
+    [SPECIES_POLITOED]    = gMonIcon_Politoed,
+    [SPECIES_HOPPIP]      = gMonIcon_Hoppip,
+    [SPECIES_SKIPLOOM]    = gMonIcon_Skiploom,
+    [SPECIES_JUMPLUFF]    = gMonIcon_Jumpluff,
+    [SPECIES_AIPOM]       = gMonIcon_Aipom,
+    [SPECIES_SUNKERN]     = gMonIcon_Sunkern,
+    [SPECIES_SUNFLORA]    = gMonIcon_Sunflora,
+    [SPECIES_YANMA]       = gMonIcon_Yanma,
+    [SPECIES_WOOPER]      = gMonIcon_Wooper,
+    [SPECIES_QUAGSIRE]    = gMonIcon_Quagsire,
+    [SPECIES_ESPEON]      = gMonIcon_Espeon,
+    [SPECIES_UMBREON]     = gMonIcon_Umbreon,
+    [SPECIES_MURKROW]     = gMonIcon_Murkrow,
+    [SPECIES_SLOWKING]    = gMonIcon_Slowking,
+    [SPECIES_MISDREAVUS]  = gMonIcon_Misdreavus,
+    [SPECIES_UNOWN]       = gMonIcon_Unown_A,
+    [SPECIES_WOBBUFFET]   = gMonIcon_Wobbuffet,
+    [SPECIES_GIRAFARIG]   = gMonIcon_Girafarig,
+    [SPECIES_PINECO]      = gMonIcon_Pineco,
+    [SPECIES_FORRETRESS]  = gMonIcon_Forretress,
+    [SPECIES_DUNSPARCE]   = gMonIcon_Dunsparce,
+    [SPECIES_GLIGAR]      = gMonIcon_Gligar,
+    [SPECIES_STEELIX]     = gMonIcon_Steelix,
+    [SPECIES_SNUBBULL]    = gMonIcon_Snubbull,
+    [SPECIES_GRANBULL]    = gMonIcon_Granbull,
+    [SPECIES_QWILFISH]    = gMonIcon_Qwilfish,
+    [SPECIES_SCIZOR]      = gMonIcon_Scizor,
+    [SPECIES_SHUCKLE]     = gMonIcon_Shuckle,
+    [SPECIES_HERACROSS]   = gMonIcon_Heracross,
+    [SPECIES_SNEASEL]     = gMonIcon_Sneasel,
+    [SPECIES_TEDDIURSA]   = gMonIcon_Teddiursa,
+    [SPECIES_URSARING]    = gMonIcon_Ursaring,
+    [SPECIES_SLUGMA]      = gMonIcon_Slugma,
+    [SPECIES_MAGCARGO]    = gMonIcon_Magcargo,
+    [SPECIES_SWINUB]      = gMonIcon_Swinub,
+    [SPECIES_PILOSWINE]   = gMonIcon_Piloswine,
+    [SPECIES_CORSOLA]     = gMonIcon_Corsola,
+    [SPECIES_REMORAID]    = gMonIcon_Remoraid,
+    [SPECIES_OCTILLERY]   = gMonIcon_Octillery,
+    [SPECIES_DELIBIRD]    = gMonIcon_Delibird,
+    [SPECIES_MANTINE]     = gMonIcon_Mantine,
+    [SPECIES_SKARMORY]    = gMonIcon_Skarmory,
+    [SPECIES_HOUNDOUR]    = gMonIcon_Houndour,
+    [SPECIES_HOUNDOOM]    = gMonIcon_Houndoom,
+    [SPECIES_KINGDRA]     = gMonIcon_Kingdra,
+    [SPECIES_PHANPY]      = gMonIcon_Phanpy,
+    [SPECIES_DONPHAN]     = gMonIcon_Donphan,
+    [SPECIES_PORYGON2]    = gMonIcon_Porygon2,
+    [SPECIES_STANTLER]    = gMonIcon_Stantler,
+    [SPECIES_SMEARGLE]    = gMonIcon_Smeargle,
+    [SPECIES_TYROGUE]     = gMonIcon_Tyrogue,
+    [SPECIES_HITMONTOP]   = gMonIcon_Hitmontop,
+    [SPECIES_SMOOCHUM]    = gMonIcon_Smoochum,
+    [SPECIES_ELEKID]      = gMonIcon_Elekid,
+    [SPECIES_MAGBY]       = gMonIcon_Magby,
+    [SPECIES_MILTANK]     = gMonIcon_Miltank,
+    [SPECIES_BLISSEY]     = gMonIcon_Blissey,
+    [SPECIES_RAIKOU]      = gMonIcon_Raikou,
+    [SPECIES_ENTEI]       = gMonIcon_Entei,
+    [SPECIES_SUICUNE]     = gMonIcon_Suicune,
+    [SPECIES_LARVITAR]    = gMonIcon_Larvitar,
+    [SPECIES_PUPITAR]     = gMonIcon_Pupitar,
+    [SPECIES_TYRANITAR]   = gMonIcon_Tyranitar,
+    [SPECIES_LUGIA]       = gMonIcon_Lugia,
+    [SPECIES_HO_OH]       = gMonIcon_Ho_Oh,
+    [SPECIES_CELEBI]      = gMonIcon_Celebi,
+    [SPECIES_OLD_UNOWN_B] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_C] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_D] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_E] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_F] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_G] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_H] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_I] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_J] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_K] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_L] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_M] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_N] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_O] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_P] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_Q] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_R] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_S] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_T] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_U] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_V] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_W] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_X] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_Y] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_Z] = gMonIcon_QuestionMark,
+    [SPECIES_TREECKO]     = gMonIcon_Treecko,
+    [SPECIES_GROVYLE]     = gMonIcon_Grovyle,
+    [SPECIES_SCEPTILE]    = gMonIcon_Sceptile,
+    [SPECIES_TORCHIC]     = gMonIcon_Torchic,
+    [SPECIES_COMBUSKEN]   = gMonIcon_Combusken,
+    [SPECIES_BLAZIKEN]    = gMonIcon_Blaziken,
+    [SPECIES_MUDKIP]      = gMonIcon_Mudkip,
+    [SPECIES_MARSHTOMP]   = gMonIcon_Marshtomp,
+    [SPECIES_SWAMPERT]    = gMonIcon_Swampert,
+    [SPECIES_POOCHYENA]   = gMonIcon_Poochyena,
+    [SPECIES_MIGHTYENA]   = gMonIcon_Mightyena,
+    [SPECIES_ZIGZAGOON]   = gMonIcon_Zigzagoon,
+    [SPECIES_LINOONE]     = gMonIcon_Linoone,
+    [SPECIES_WURMPLE]     = gMonIcon_Wurmple,
+    [SPECIES_SILCOON]     = gMonIcon_Silcoon,
+    [SPECIES_BEAUTIFLY]   = gMonIcon_Beautifly,
+    [SPECIES_CASCOON]     = gMonIcon_Cascoon,
+    [SPECIES_DUSTOX]      = gMonIcon_Dustox,
+    [SPECIES_LOTAD]       = gMonIcon_Lotad,
+    [SPECIES_LOMBRE]      = gMonIcon_Lombre,
+    [SPECIES_LUDICOLO]    = gMonIcon_Ludicolo,
+    [SPECIES_SEEDOT]      = gMonIcon_Seedot,
+    [SPECIES_NUZLEAF]     = gMonIcon_Nuzleaf,
+    [SPECIES_SHIFTRY]     = gMonIcon_Shiftry,
+    [SPECIES_NINCADA]     = gMonIcon_Nincada,
+    [SPECIES_NINJASK]     = gMonIcon_Ninjask,
+    [SPECIES_SHEDINJA]    = gMonIcon_Shedinja,
+    [SPECIES_TAILLOW]     = gMonIcon_Taillow,
+    [SPECIES_SWELLOW]     = gMonIcon_Swellow,
+    [SPECIES_SHROOMISH]   = gMonIcon_Shroomish,
+    [SPECIES_BRELOOM]     = gMonIcon_Breloom,
+    [SPECIES_SPINDA]      = gMonIcon_Spinda,
+    [SPECIES_WINGULL]     = gMonIcon_Wingull,
+    [SPECIES_PELIPPER]    = gMonIcon_Pelipper,
+    [SPECIES_SURSKIT]     = gMonIcon_Surskit,
+    [SPECIES_MASQUERAIN]  = gMonIcon_Masquerain,
+    [SPECIES_WAILMER]     = gMonIcon_Wailmer,
+    [SPECIES_WAILORD]     = gMonIcon_Wailord,
+    [SPECIES_SKITTY]      = gMonIcon_Skitty,
+    [SPECIES_DELCATTY]    = gMonIcon_Delcatty,
+    [SPECIES_KECLEON]     = gMonIcon_Kecleon,
+    [SPECIES_BALTOY]      = gMonIcon_Baltoy,
+    [SPECIES_CLAYDOL]     = gMonIcon_Claydol,
+    [SPECIES_NOSEPASS]    = gMonIcon_Nosepass,
+    [SPECIES_TORKOAL]     = gMonIcon_Torkoal,
+    [SPECIES_SABLEYE]     = gMonIcon_Sableye,
+    [SPECIES_BARBOACH]    = gMonIcon_Barboach,
+    [SPECIES_WHISCASH]    = gMonIcon_Whiscash,
+    [SPECIES_LUVDISC]     = gMonIcon_Luvdisc,
+    [SPECIES_CORPHISH]    = gMonIcon_Corphish,
+    [SPECIES_CRAWDAUNT]   = gMonIcon_Crawdaunt,
+    [SPECIES_FEEBAS]      = gMonIcon_Feebas,
+    [SPECIES_MILOTIC]     = gMonIcon_Milotic,
+    [SPECIES_CARVANHA]    = gMonIcon_Carvanha,
+    [SPECIES_SHARPEDO]    = gMonIcon_Sharpedo,
+    [SPECIES_TRAPINCH]    = gMonIcon_Trapinch,
+    [SPECIES_VIBRAVA]     = gMonIcon_Vibrava,
+    [SPECIES_FLYGON]      = gMonIcon_Flygon,
+    [SPECIES_MAKUHITA]    = gMonIcon_Makuhita,
+    [SPECIES_HARIYAMA]    = gMonIcon_Hariyama,
+    [SPECIES_ELECTRIKE]   = gMonIcon_Electrike,
+    [SPECIES_MANECTRIC]   = gMonIcon_Manectric,
+    [SPECIES_NUMEL]       = gMonIcon_Numel,
+    [SPECIES_CAMERUPT]    = gMonIcon_Camerupt,
+    [SPECIES_SPHEAL]      = gMonIcon_Spheal,
+    [SPECIES_SEALEO]      = gMonIcon_Sealeo,
+    [SPECIES_WALREIN]     = gMonIcon_Walrein,
+    [SPECIES_CACNEA]      = gMonIcon_Cacnea,
+    [SPECIES_CACTURNE]    = gMonIcon_Cacturne,
+    [SPECIES_SNORUNT]     = gMonIcon_Snorunt,
+    [SPECIES_GLALIE]      = gMonIcon_Glalie,
+    [SPECIES_LUNATONE]    = gMonIcon_Lunatone,
+    [SPECIES_SOLROCK]     = gMonIcon_Solrock,
+    [SPECIES_AZURILL]     = gMonIcon_Azurill,
+    [SPECIES_SPOINK]      = gMonIcon_Spoink,
+    [SPECIES_GRUMPIG]     = gMonIcon_Grumpig,
+    [SPECIES_PLUSLE]      = gMonIcon_Plusle,
+    [SPECIES_MINUN]       = gMonIcon_Minun,
+    [SPECIES_MAWILE]      = gMonIcon_Mawile,
+    [SPECIES_MEDITITE]    = gMonIcon_Meditite,
+    [SPECIES_MEDICHAM]    = gMonIcon_Medicham,
+    [SPECIES_SWABLU]      = gMonIcon_Swablu,
+    [SPECIES_ALTARIA]     = gMonIcon_Altaria,
+    [SPECIES_WYNAUT]      = gMonIcon_Wynaut,
+    [SPECIES_DUSKULL]     = gMonIcon_Duskull,
+    [SPECIES_DUSCLOPS]    = gMonIcon_Dusclops,
+    [SPECIES_ROSELIA]     = gMonIcon_Roselia,
+    [SPECIES_SLAKOTH]     = gMonIcon_Slakoth,
+    [SPECIES_VIGOROTH]    = gMonIcon_Vigoroth,
+    [SPECIES_SLAKING]     = gMonIcon_Slaking,
+    [SPECIES_GULPIN]      = gMonIcon_Gulpin,
+    [SPECIES_SWALOT]      = gMonIcon_Swalot,
+    [SPECIES_TROPIUS]     = gMonIcon_Tropius,
+    [SPECIES_WHISMUR]     = gMonIcon_Whismur,
+    [SPECIES_LOUDRED]     = gMonIcon_Loudred,
+    [SPECIES_EXPLOUD]     = gMonIcon_Exploud,
+    [SPECIES_CLAMPERL]    = gMonIcon_Clamperl,
+    [SPECIES_HUNTAIL]     = gMonIcon_Huntail,
+    [SPECIES_GOREBYSS]    = gMonIcon_Gorebyss,
+    [SPECIES_ABSOL]       = gMonIcon_Absol,
+    [SPECIES_SHUPPET]     = gMonIcon_Shuppet,
+    [SPECIES_BANETTE]     = gMonIcon_Banette,
+    [SPECIES_SEVIPER]     = gMonIcon_Seviper,
+    [SPECIES_ZANGOOSE]    = gMonIcon_Zangoose,
+    [SPECIES_RELICANTH]   = gMonIcon_Relicanth,
+    [SPECIES_ARON]        = gMonIcon_Aron,
+    [SPECIES_LAIRON]      = gMonIcon_Lairon,
+    [SPECIES_AGGRON]      = gMonIcon_Aggron,
+    [SPECIES_CASTFORM]    = gMonIcon_Castform,
+    [SPECIES_VOLBEAT]     = gMonIcon_Volbeat,
+    [SPECIES_ILLUMISE]    = gMonIcon_Illumise,
+    [SPECIES_LILEEP]      = gMonIcon_Lileep,
+    [SPECIES_CRADILY]     = gMonIcon_Cradily,
+    [SPECIES_ANORITH]     = gMonIcon_Anorith,
+    [SPECIES_ARMALDO]     = gMonIcon_Armaldo,
+    [SPECIES_RALTS]       = gMonIcon_Ralts,
+    [SPECIES_KIRLIA]      = gMonIcon_Kirlia,
+    [SPECIES_GARDEVOIR]   = gMonIcon_Gardevoir,
+    [SPECIES_BAGON]       = gMonIcon_Bagon,
+    [SPECIES_SHELGON]     = gMonIcon_Shelgon,
+    [SPECIES_SALAMENCE]   = gMonIcon_Salamence,
+    [SPECIES_BELDUM]      = gMonIcon_Beldum,
+    [SPECIES_METANG]      = gMonIcon_Metang,
+    [SPECIES_METAGROSS]   = gMonIcon_Metagross,
+    [SPECIES_REGIROCK]    = gMonIcon_Regirock,
+    [SPECIES_REGICE]      = gMonIcon_Regice,
+    [SPECIES_REGISTEEL]   = gMonIcon_Registeel,
+    [SPECIES_KYOGRE]      = gMonIcon_Kyogre,
+    [SPECIES_GROUDON]     = gMonIcon_Groudon,
+    [SPECIES_RAYQUAZA]    = gMonIcon_Rayquaza,
+    [SPECIES_LATIAS]      = gMonIcon_Latias,
+    [SPECIES_LATIOS]      = gMonIcon_Latios,
+    [SPECIES_JIRACHI]     = gMonIcon_Jirachi,
+    [SPECIES_DEOXYS]      = gMonIcon_Deoxys,
+    [SPECIES_CHIMECHO]    = gMonIcon_Chimecho,
+    [SPECIES_EGG]         = gMonIcon_Egg,
+    [SPECIES_UNOWN_B]     = gMonIcon_Unown_B,
+    [SPECIES_UNOWN_C]     = gMonIcon_Unown_C,
+    [SPECIES_UNOWN_D]     = gMonIcon_Unown_D,
+    [SPECIES_UNOWN_E]     = gMonIcon_Unown_E,
+    [SPECIES_UNOWN_F]     = gMonIcon_Unown_F,
+    [SPECIES_UNOWN_G]     = gMonIcon_Unown_G,
+    [SPECIES_UNOWN_H]     = gMonIcon_Unown_H,
+    [SPECIES_UNOWN_I]     = gMonIcon_Unown_I,
+    [SPECIES_UNOWN_J]     = gMonIcon_Unown_J,
+    [SPECIES_UNOWN_K]     = gMonIcon_Unown_K,
+    [SPECIES_UNOWN_L]     = gMonIcon_Unown_L,
+    [SPECIES_UNOWN_M]     = gMonIcon_Unown_M,
+    [SPECIES_UNOWN_N]     = gMonIcon_Unown_N,
+    [SPECIES_UNOWN_O]     = gMonIcon_Unown_O,
+    [SPECIES_UNOWN_P]     = gMonIcon_Unown_P,
+    [SPECIES_UNOWN_Q]     = gMonIcon_Unown_Q,
+    [SPECIES_UNOWN_R]     = gMonIcon_Unown_R,
+    [SPECIES_UNOWN_S]     = gMonIcon_Unown_S,
+    [SPECIES_UNOWN_T]     = gMonIcon_Unown_T,
+    [SPECIES_UNOWN_U]     = gMonIcon_Unown_U,
+    [SPECIES_UNOWN_V]     = gMonIcon_Unown_V,
+    [SPECIES_UNOWN_W]     = gMonIcon_Unown_W,
+    [SPECIES_UNOWN_X]     = gMonIcon_Unown_X,
+    [SPECIES_UNOWN_Y]     = gMonIcon_Unown_Y,
+    [SPECIES_UNOWN_Z]     = gMonIcon_Unown_Z,
+    [SPECIES_UNOWN_EMARK] = gMonIcon_Unown_ExclamationMark,
+    [SPECIES_UNOWN_QMARK] = gMonIcon_Unown_QuestionMark
+};
+
+const u8 gMonIconPaletteIndices[] = {
+    [SPECIES_NONE]        = 0,
+    [SPECIES_BULBASAUR]   = 1,
+    [SPECIES_IVYSAUR]     = 1,
+    [SPECIES_VENUSAUR]    = 1,
+    [SPECIES_CHARMANDER]  = 0,
+    [SPECIES_CHARMELEON]  = 0,
+    [SPECIES_CHARIZARD]   = 0,
+    [SPECIES_SQUIRTLE]    = 0,
+    [SPECIES_WARTORTLE]   = 2,
+    [SPECIES_BLASTOISE]   = 2,
+    [SPECIES_CATERPIE]    = 1,
+    [SPECIES_METAPOD]     = 1,
+    [SPECIES_BUTTERFREE]  = 0,
+    [SPECIES_WEEDLE]      = 1,
+    [SPECIES_KAKUNA]      = 2,
+    [SPECIES_BEEDRILL]    = 2,
+    [SPECIES_PIDGEY]      = 0,
+    [SPECIES_PIDGEOTTO]   = 0,
+    [SPECIES_PIDGEOT]     = 0,
+    [SPECIES_RATTATA]     = 2,
+    [SPECIES_RATICATE]    = 1,
+    [SPECIES_SPEAROW]     = 0,
+    [SPECIES_FEAROW]      = 0,
+    [SPECIES_EKANS]       = 2,
+    [SPECIES_ARBOK]       = 2,
+    [SPECIES_PIKACHU]     = 2,
+    [SPECIES_RAICHU]      = 0,
+    [SPECIES_SANDSHREW]   = 2,
+    [SPECIES_SANDSLASH]   = 2,
+    [SPECIES_NIDORAN_F]   = 2,
+    [SPECIES_NIDORINA]    = 2,
+    [SPECIES_NIDOQUEEN]   = 2,
+    [SPECIES_NIDORAN_M]   = 2,
+    [SPECIES_NIDORINO]    = 2,
+    [SPECIES_NIDOKING]    = 2,
+    [SPECIES_CLEFAIRY]    = 0,
+    [SPECIES_CLEFABLE]    = 0,
+    [SPECIES_VULPIX]      = 2,
+    [SPECIES_NINETALES]   = 1,
+    [SPECIES_JIGGLYPUFF]  = 0,
+    [SPECIES_WIGGLYTUFF]  = 0,
+    [SPECIES_ZUBAT]       = 2,
+    [SPECIES_GOLBAT]      = 2,
+    [SPECIES_ODDISH]      = 1,
+    [SPECIES_GLOOM]       = 0,
+    [SPECIES_VILEPLUME]   = 0,
+    [SPECIES_PARAS]       = 0,
+    [SPECIES_PARASECT]    = 0,
+    [SPECIES_VENONAT]     = 0,
+    [SPECIES_VENOMOTH]    = 2,
+    [SPECIES_DIGLETT]     = 2,
+    [SPECIES_DUGTRIO]     = 2,
+    [SPECIES_MEOWTH]      = 1,
+    [SPECIES_PERSIAN]     = 1,
+    [SPECIES_PSYDUCK]     = 1,
+    [SPECIES_GOLDUCK]     = 2,
+    [SPECIES_MANKEY]      = 1,
+    [SPECIES_PRIMEAPE]    = 2,
+    [SPECIES_GROWLITHE]   = 0,
+    [SPECIES_ARCANINE]    = 0,
+    [SPECIES_POLIWAG]     = 0,
+    [SPECIES_POLIWHIRL]   = 0,
+    [SPECIES_POLIWRATH]   = 0,
+    [SPECIES_ABRA]        = 2,
+    [SPECIES_KADABRA]     = 2,
+    [SPECIES_ALAKAZAM]    = 2,
+    [SPECIES_MACHOP]      = 0,
+    [SPECIES_MACHOKE]     = 2,
+    [SPECIES_MACHAMP]     = 0,
+    [SPECIES_BELLSPROUT]  = 1,
+    [SPECIES_WEEPINBELL]  = 1,
+    [SPECIES_VICTREEBEL]  = 1,
+    [SPECIES_TENTACOOL]   = 2,
+    [SPECIES_TENTACRUEL]  = 2,
+    [SPECIES_GEODUDE]     = 1,
+    [SPECIES_GRAVELER]    = 1,
+    [SPECIES_GOLEM]       = 1,
+    [SPECIES_PONYTA]      = 0,
+    [SPECIES_RAPIDASH]    = 0,
+    [SPECIES_SLOWPOKE]    = 0,
+    [SPECIES_SLOWBRO]     = 0,
+    [SPECIES_MAGNEMITE]   = 0,
+    [SPECIES_MAGNETON]    = 0,
+    [SPECIES_FARFETCHD]   = 1,
+    [SPECIES_DODUO]       = 2,
+    [SPECIES_DODRIO]      = 2,
+    [SPECIES_SEEL]        = 2,
+    [SPECIES_DEWGONG]     = 2,
+    [SPECIES_GRIMER]      = 2,
+    [SPECIES_MUK]         = 2,
+    [SPECIES_SHELLDER]    = 2,
+    [SPECIES_CLOYSTER]    = 2,
+    [SPECIES_GASTLY]      = 2,
+    [SPECIES_HAUNTER]     = 2,
+    [SPECIES_GENGAR]      = 2,
+    [SPECIES_ONIX]        = 2,
+    [SPECIES_DROWZEE]     = 2,
+    [SPECIES_HYPNO]       = 1,
+    [SPECIES_KRABBY]      = 2,
+    [SPECIES_KINGLER]     = 2,
+    [SPECIES_VOLTORB]     = 0,
+    [SPECIES_ELECTRODE]   = 0,
+    [SPECIES_EXEGGCUTE]   = 0,
+    [SPECIES_EXEGGUTOR]   = 1,
+    [SPECIES_CUBONE]      = 1,
+    [SPECIES_MAROWAK]     = 1,
+    [SPECIES_HITMONLEE]   = 2,
+    [SPECIES_HITMONCHAN]  = 2,
+    [SPECIES_LICKITUNG]   = 1,
+    [SPECIES_KOFFING]     = 2,
+    [SPECIES_WEEZING]     = 2,
+    [SPECIES_RHYHORN]     = 1,
+    [SPECIES_RHYDON]      = 1,
+    [SPECIES_CHANSEY]     = 0,
+    [SPECIES_TANGELA]     = 0,
+    [SPECIES_KANGASKHAN]  = 1,
+    [SPECIES_HORSEA]      = 0,
+    [SPECIES_SEADRA]      = 0,
+    [SPECIES_GOLDEEN]     = 0,
+    [SPECIES_SEAKING]     = 0,
+    [SPECIES_STARYU]      = 2,
+    [SPECIES_STARMIE]     = 2,
+    [SPECIES_MR_MIME]     = 0,
+    [SPECIES_SCYTHER]     = 1,
+    [SPECIES_JYNX]        = 2,
+    [SPECIES_ELECTABUZZ]  = 1,
+    [SPECIES_MAGMAR]      = 0,
+    [SPECIES_PINSIR]      = 2,
+    [SPECIES_TAUROS]      = 2,
+    [SPECIES_MAGIKARP]    = 0,
+    [SPECIES_GYARADOS]    = 0,
+    [SPECIES_LAPRAS]      = 2,
+    [SPECIES_DITTO]       = 2,
+    [SPECIES_EEVEE]       = 2,
+    [SPECIES_VAPOREON]    = 0,
+    [SPECIES_JOLTEON]     = 0,
+    [SPECIES_FLAREON]     = 0,
+    [SPECIES_PORYGON]     = 0,
+    [SPECIES_OMANYTE]     = 0,
+    [SPECIES_OMASTAR]     = 0,
+    [SPECIES_KABUTO]      = 2,
+    [SPECIES_KABUTOPS]    = 2,
+    [SPECIES_AERODACTYL]  = 0,
+    [SPECIES_SNORLAX]     = 1,
+    [SPECIES_ARTICUNO]    = 0,
+    [SPECIES_ZAPDOS]      = 0,
+    [SPECIES_MOLTRES]     = 0,
+    [SPECIES_DRATINI]     = 0,
+    [SPECIES_DRAGONAIR]   = 0,
+    [SPECIES_DRAGONITE]   = 2,
+    [SPECIES_MEWTWO]      = 2,
+    [SPECIES_MEW]         = 0,
+    [SPECIES_CHIKORITA]   = 1,
+    [SPECIES_BAYLEEF]     = 1,
+    [SPECIES_MEGANIUM]    = 1,
+    [SPECIES_CYNDAQUIL]   = 1,
+    [SPECIES_QUILAVA]     = 1,
+    [SPECIES_TYPHLOSION]  = 1,
+    [SPECIES_TOTODILE]    = 2,
+    [SPECIES_CROCONAW]    = 2,
+    [SPECIES_FERALIGATR]  = 2,
+    [SPECIES_SENTRET]     = 2,
+    [SPECIES_FURRET]      = 2,
+    [SPECIES_HOOTHOOT]    = 2,
+    [SPECIES_NOCTOWL]     = 2,
+    [SPECIES_LEDYBA]      = 0,
+    [SPECIES_LEDIAN]      = 0,
+    [SPECIES_SPINARAK]    = 1,
+    [SPECIES_ARIADOS]     = 0,
+    [SPECIES_CROBAT]      = 2,
+    [SPECIES_CHINCHOU]    = 2,
+    [SPECIES_LANTURN]     = 0,
+    [SPECIES_PICHU]       = 0,
+    [SPECIES_CLEFFA]      = 0,
+    [SPECIES_IGGLYBUFF]   = 1,
+    [SPECIES_TOGEPI]      = 2,
+    [SPECIES_TOGETIC]     = 2,
+    [SPECIES_NATU]        = 0,
+    [SPECIES_XATU]        = 0,
+    [SPECIES_MAREEP]      = 2,
+    [SPECIES_FLAAFFY]     = 0,
+    [SPECIES_AMPHAROS]    = 0,
+    [SPECIES_BELLOSSOM]   = 1,
+    [SPECIES_MARILL]      = 2,
+    [SPECIES_AZUMARILL]   = 2,
+    [SPECIES_SUDOWOODO]   = 1,
+    [SPECIES_POLITOED]    = 1,
+    [SPECIES_HOPPIP]      = 1,
+    [SPECIES_SKIPLOOM]    = 1,
+    [SPECIES_JUMPLUFF]    = 2,
+    [SPECIES_AIPOM]       = 2,
+    [SPECIES_SUNKERN]     = 1,
+    [SPECIES_SUNFLORA]    = 1,
+    [SPECIES_YANMA]       = 1,
+    [SPECIES_WOOPER]      = 0,
+    [SPECIES_QUAGSIRE]    = 0,
+    [SPECIES_ESPEON]      = 2,
+    [SPECIES_UMBREON]     = 2,
+    [SPECIES_MURKROW]     = 2,
+    [SPECIES_SLOWKING]    = 0,
+    [SPECIES_MISDREAVUS]  = 0,
+    [SPECIES_UNOWN]       = 0,
+    [SPECIES_WOBBUFFET]   = 0,
+    [SPECIES_GIRAFARIG]   = 1,
+    [SPECIES_PINECO]      = 0,
+    [SPECIES_FORRETRESS]  = 2,
+    [SPECIES_DUNSPARCE]   = 2,
+    [SPECIES_GLIGAR]      = 2,
+    [SPECIES_STEELIX]     = 0,
+    [SPECIES_SNUBBULL]    = 0,
+    [SPECIES_GRANBULL]    = 2,
+    [SPECIES_QWILFISH]    = 0,
+    [SPECIES_SCIZOR]      = 0,
+    [SPECIES_SHUCKLE]     = 1,
+    [SPECIES_HERACROSS]   = 2,
+    [SPECIES_SNEASEL]     = 0,
+    [SPECIES_TEDDIURSA]   = 0,
+    [SPECIES_URSARING]    = 2,
+    [SPECIES_SLUGMA]      = 0,
+    [SPECIES_MAGCARGO]    = 0,
+    [SPECIES_SWINUB]      = 2,
+    [SPECIES_PILOSWINE]   = 2,
+    [SPECIES_CORSOLA]     = 0,
+    [SPECIES_REMORAID]    = 0,
+    [SPECIES_OCTILLERY]   = 0,
+    [SPECIES_DELIBIRD]    = 0,
+    [SPECIES_MANTINE]     = 2,
+    [SPECIES_SKARMORY]    = 0,
+    [SPECIES_HOUNDOUR]    = 0,
+    [SPECIES_HOUNDOOM]    = 0,
+    [SPECIES_KINGDRA]     = 0,
+    [SPECIES_PHANPY]      = 0,
+    [SPECIES_DONPHAN]     = 0,
+    [SPECIES_PORYGON2]    = 0,
+    [SPECIES_STANTLER]    = 2,
+    [SPECIES_SMEARGLE]    = 1,
+    [SPECIES_TYROGUE]     = 2,
+    [SPECIES_HITMONTOP]   = 2,
+    [SPECIES_SMOOCHUM]    = 1,
+    [SPECIES_ELEKID]      = 1,
+    [SPECIES_MAGBY]       = 1,
+    [SPECIES_MILTANK]     = 1,
+    [SPECIES_BLISSEY]     = 1,
+    [SPECIES_RAIKOU]      = 0,
+    [SPECIES_ENTEI]       = 2,
+    [SPECIES_SUICUNE]     = 0,
+    [SPECIES_LARVITAR]    = 1,
+    [SPECIES_PUPITAR]     = 0,
+    [SPECIES_TYRANITAR]   = 1,
+    [SPECIES_LUGIA]       = 0,
+    [SPECIES_HO_OH]       = 1,
+    [SPECIES_CELEBI]      = 1,
+    [SPECIES_OLD_UNOWN_B] = 0,
+    [SPECIES_OLD_UNOWN_C] = 0,
+    [SPECIES_OLD_UNOWN_D] = 0,
+    [SPECIES_OLD_UNOWN_E] = 0,
+    [SPECIES_OLD_UNOWN_F] = 0,
+    [SPECIES_OLD_UNOWN_G] = 0,
+    [SPECIES_OLD_UNOWN_H] = 0,
+    [SPECIES_OLD_UNOWN_I] = 0,
+    [SPECIES_OLD_UNOWN_J] = 0,
+    [SPECIES_OLD_UNOWN_K] = 0,
+    [SPECIES_OLD_UNOWN_L] = 0,
+    [SPECIES_OLD_UNOWN_M] = 0,
+    [SPECIES_OLD_UNOWN_N] = 0,
+    [SPECIES_OLD_UNOWN_O] = 0,
+    [SPECIES_OLD_UNOWN_P] = 0,
+    [SPECIES_OLD_UNOWN_Q] = 0,
+    [SPECIES_OLD_UNOWN_R] = 0,
+    [SPECIES_OLD_UNOWN_S] = 0,
+    [SPECIES_OLD_UNOWN_T] = 0,
+    [SPECIES_OLD_UNOWN_U] = 0,
+    [SPECIES_OLD_UNOWN_V] = 0,
+    [SPECIES_OLD_UNOWN_W] = 0,
+    [SPECIES_OLD_UNOWN_X] = 0,
+    [SPECIES_OLD_UNOWN_Y] = 0,
+    [SPECIES_OLD_UNOWN_Z] = 0,
+    [SPECIES_TREECKO]     = 1,
+    [SPECIES_GROVYLE]     = 0,
+    [SPECIES_SCEPTILE]    = 1,
+    [SPECIES_TORCHIC]     = 0,
+    [SPECIES_COMBUSKEN]   = 0,
+    [SPECIES_BLAZIKEN]    = 0,
+    [SPECIES_MUDKIP]      = 0,
+    [SPECIES_MARSHTOMP]   = 0,
+    [SPECIES_SWAMPERT]    = 0,
+    [SPECIES_POOCHYENA]   = 2,
+    [SPECIES_MIGHTYENA]   = 2,
+    [SPECIES_ZIGZAGOON]   = 2,
+    [SPECIES_LINOONE]     = 2,
+    [SPECIES_WURMPLE]     = 0,
+    [SPECIES_SILCOON]     = 2,
+    [SPECIES_BEAUTIFLY]   = 0,
+    [SPECIES_CASCOON]     = 2,
+    [SPECIES_DUSTOX]      = 1,
+    [SPECIES_LOTAD]       = 1,
+    [SPECIES_LOMBRE]      = 1,
+    [SPECIES_LUDICOLO]    = 1,
+    [SPECIES_SEEDOT]      = 1,
+    [SPECIES_NUZLEAF]     = 1,
+    [SPECIES_SHIFTRY]     = 0,
+    [SPECIES_NINCADA]     = 1,
+    [SPECIES_NINJASK]     = 1,
+    [SPECIES_SHEDINJA]    = 1,
+    [SPECIES_TAILLOW]     = 2,
+    [SPECIES_SWELLOW]     = 2,
+    [SPECIES_SHROOMISH]   = 1,
+    [SPECIES_BRELOOM]     = 1,
+    [SPECIES_SPINDA]      = 1,
+    [SPECIES_WINGULL]     = 0,
+    [SPECIES_PELIPPER]    = 0,
+    [SPECIES_SURSKIT]     = 2,
+    [SPECIES_MASQUERAIN]  = 0,
+    [SPECIES_WAILMER]     = 2,
+    [SPECIES_WAILORD]     = 0,
+    [SPECIES_SKITTY]      = 0,
+    [SPECIES_DELCATTY]    = 2,
+    [SPECIES_KECLEON]     = 1,
+    [SPECIES_BALTOY]      = 1,
+    [SPECIES_CLAYDOL]     = 0,
+    [SPECIES_NOSEPASS]    = 0,
+    [SPECIES_TORKOAL]     = 1,
+    [SPECIES_SABLEYE]     = 2,
+    [SPECIES_BARBOACH]    = 0,
+    [SPECIES_WHISCASH]    = 0,
+    [SPECIES_LUVDISC]     = 0,
+    [SPECIES_CORPHISH]    = 0,
+    [SPECIES_CRAWDAUNT]   = 0,
+    [SPECIES_FEEBAS]      = 2,
+    [SPECIES_MILOTIC]     = 0,
+    [SPECIES_CARVANHA]    = 0,
+    [SPECIES_SHARPEDO]    = 0,
+    [SPECIES_TRAPINCH]    = 1,
+    [SPECIES_VIBRAVA]     = 1,
+    [SPECIES_FLYGON]      = 1,
+    [SPECIES_MAKUHITA]    = 2,
+    [SPECIES_HARIYAMA]    = 1,
+    [SPECIES_ELECTRIKE]   = 1,
+    [SPECIES_MANECTRIC]   = 0,
+    [SPECIES_NUMEL]       = 1,
+    [SPECIES_CAMERUPT]    = 0,
+    [SPECIES_SPHEAL]      = 2,
+    [SPECIES_SEALEO]      = 2,
+    [SPECIES_WALREIN]     = 0,
+    [SPECIES_CACNEA]      = 1,
+    [SPECIES_CACTURNE]    = 1,
+    [SPECIES_SNORUNT]     = 2,
+    [SPECIES_GLALIE]      = 0,
+    [SPECIES_LUNATONE]    = 1,
+    [SPECIES_SOLROCK]     = 0,
+    [SPECIES_AZURILL]     = 2,
+    [SPECIES_SPOINK]      = 0,
+    [SPECIES_GRUMPIG]     = 2,
+    [SPECIES_PLUSLE]      = 0,
+    [SPECIES_MINUN]       = 0,
+    [SPECIES_MAWILE]      = 2,
+    [SPECIES_MEDITITE]    = 0,
+    [SPECIES_MEDICHAM]    = 0,
+    [SPECIES_SWABLU]      = 0,
+    [SPECIES_ALTARIA]     = 0,
+    [SPECIES_WYNAUT]      = 0,
+    [SPECIES_DUSKULL]     = 0,
+    [SPECIES_DUSCLOPS]    = 0,
+    [SPECIES_ROSELIA]     = 0,
+    [SPECIES_SLAKOTH]     = 2,
+    [SPECIES_VIGOROTH]    = 2,
+    [SPECIES_SLAKING]     = 1,
+    [SPECIES_GULPIN]      = 1,
+    [SPECIES_SWALOT]      = 2,
+    [SPECIES_TROPIUS]     = 1,
+    [SPECIES_WHISMUR]     = 0,
+    [SPECIES_LOUDRED]     = 2,
+    [SPECIES_EXPLOUD]     = 2,
+    [SPECIES_CLAMPERL]    = 0,
+    [SPECIES_HUNTAIL]     = 0,
+    [SPECIES_GOREBYSS]    = 0,
+    [SPECIES_ABSOL]       = 0,
+    [SPECIES_SHUPPET]     = 0,
+    [SPECIES_BANETTE]     = 0,
+    [SPECIES_SEVIPER]     = 2,
+    [SPECIES_ZANGOOSE]    = 0,
+    [SPECIES_RELICANTH]   = 1,
+    [SPECIES_ARON]        = 2,
+    [SPECIES_LAIRON]      = 2,
+    [SPECIES_AGGRON]      = 2,
+    [SPECIES_CASTFORM]    = 0,
+    [SPECIES_VOLBEAT]     = 0,
+    [SPECIES_ILLUMISE]    = 2,
+    [SPECIES_LILEEP]      = 2,
+    [SPECIES_CRADILY]     = 0,
+    [SPECIES_ANORITH]     = 0,
+    [SPECIES_ARMALDO]     = 0,
+    [SPECIES_RALTS]       = 1,
+    [SPECIES_KIRLIA]      = 1,
+    [SPECIES_GARDEVOIR]   = 1,
+    [SPECIES_BAGON]       = 2,
+    [SPECIES_SHELGON]     = 2,
+    [SPECIES_SALAMENCE]   = 0,
+    [SPECIES_BELDUM]      = 0,
+    [SPECIES_METANG]      = 0,
+    [SPECIES_METAGROSS]   = 0,
+    [SPECIES_REGIROCK]    = 2,
+    [SPECIES_REGICE]      = 2,
+    [SPECIES_REGISTEEL]   = 2,
+    [SPECIES_KYOGRE]      = 2,
+    [SPECIES_GROUDON]     = 0,
+    [SPECIES_RAYQUAZA]    = 1,
+    [SPECIES_LATIAS]      = 0,
+    [SPECIES_LATIOS]      = 2,
+    [SPECIES_JIRACHI]     = 0,
+    [SPECIES_DEOXYS]      = 0,
+    [SPECIES_CHIMECHO]    = 0,
+    [SPECIES_EGG]         = 1,
+    [SPECIES_UNOWN_B]     = 0,
+    [SPECIES_UNOWN_C]     = 0,
+    [SPECIES_UNOWN_D]     = 0,
+    [SPECIES_UNOWN_E]     = 0,
+    [SPECIES_UNOWN_F]     = 0,
+    [SPECIES_UNOWN_G]     = 0,
+    [SPECIES_UNOWN_H]     = 0,
+    [SPECIES_UNOWN_I]     = 0,
+    [SPECIES_UNOWN_J]     = 0,
+    [SPECIES_UNOWN_K]     = 0,
+    [SPECIES_UNOWN_L]     = 0,
+    [SPECIES_UNOWN_M]     = 0,
+    [SPECIES_UNOWN_N]     = 0,
+    [SPECIES_UNOWN_O]     = 0,
+    [SPECIES_UNOWN_P]     = 0,
+    [SPECIES_UNOWN_Q]     = 0,
+    [SPECIES_UNOWN_R]     = 0,
+    [SPECIES_UNOWN_S]     = 0,
+    [SPECIES_UNOWN_T]     = 0,
+    [SPECIES_UNOWN_U]     = 0,
+    [SPECIES_UNOWN_V]     = 0,
+    [SPECIES_UNOWN_W]     = 0,
+    [SPECIES_UNOWN_X]     = 0,
+    [SPECIES_UNOWN_Y]     = 0,
+    [SPECIES_UNOWN_Z]     = 0,
+    [SPECIES_UNOWN_EMARK] = 0,
+    [SPECIES_UNOWN_QMARK] = 0
+};
+
+const struct SpritePalette gMonIconPaletteTable[] = {
+    { gMonIconPalettes[0], POKE_ICON_BASE_PAL_TAG + 0 },
+    { gMonIconPalettes[1], POKE_ICON_BASE_PAL_TAG + 1 },
+    { gMonIconPalettes[2], POKE_ICON_BASE_PAL_TAG + 2 },
+    // The following three point outside the gMonIconPalettes array
+    // and are therefore invalid. Fortunately, they are never used.
+    { gMonIconPalettes[3], POKE_ICON_BASE_PAL_TAG + 3 },
+    { gMonIconPalettes[4], POKE_ICON_BASE_PAL_TAG + 4 },
+    { gMonIconPalettes[5], POKE_ICON_BASE_PAL_TAG + 5 }
+};
+
+static const struct OamData sMonIconOamData = {
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = FALSE,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(32x32),
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(32x32),
+    .tileNum = 0x000,
+    .priority = 1,
+    .paletteNum = 0
+};
+
+static const union AnimCmd sMonIconAnim_Fast[] = {
+    ANIMCMD_FRAME(0,  6),
+    ANIMCMD_FRAME(1,  6),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sMonIconAnim_MediumFast[] = {
+    ANIMCMD_FRAME(0,  8),
+    ANIMCMD_FRAME(1,  8),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sMonIconAnim_MediumSlow[] = {
+    ANIMCMD_FRAME(0, 14),
+    ANIMCMD_FRAME(1, 14),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sMonIconAnim_Slow[] = {
+    ANIMCMD_FRAME(0, 22),
+    ANIMCMD_FRAME(1, 22),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sMonIconAnim_Still[] = {
+    ANIMCMD_FRAME(0, 29),
+    ANIMCMD_FRAME(0, 29),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd *const sMonIconAnims[] = {
+    sMonIconAnim_Fast,
+    sMonIconAnim_MediumFast,
+    sMonIconAnim_MediumSlow,
+    sMonIconAnim_Slow,
+    sMonIconAnim_Still
+};
+
+static const union AffineAnimCmd sMonIconAffineAnim_0[] = {
+    AFFINEANIMCMD_FRAME(0, 0, 0, 10),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sMonIconAffineAnim_1[] = {
+    AFFINEANIMCMD_FRAME(-2, -2, 0, 122),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd *const sMonIconAffineAnims[] = {
+    sMonIconAffineAnim_0,
+    sMonIconAffineAnim_1
+};
+
+static const u16 sSpriteImageSizes[][4] = {
+    [ST_OAM_SQUARE] = {
+        [ST_OAM_SIZE_0] = 0x020,
+        [ST_OAM_SIZE_1] = 0x080,
+        [ST_OAM_SIZE_2] = 0x200,
+        [ST_OAM_SIZE_3] = 0x800,
+    },
+    [ST_OAM_H_RECTANGLE] = {
+        [ST_OAM_SIZE_0] = 0x040,
+        [ST_OAM_SIZE_1] = 0x080,
+        [ST_OAM_SIZE_2] = 0x100,
+        [ST_OAM_SIZE_3] = 0x400,
+    },
+    [ST_OAM_V_RECTANGLE] = {
+        [ST_OAM_SIZE_0] = 0x040,
+        [ST_OAM_SIZE_1] = 0x080,
+        [ST_OAM_SIZE_2] = 0x100,
+        [ST_OAM_SIZE_3] = 0x400,
+    },
+};
+
+u8 CreateMonIcon(u16 species, SpriteCallback callback, s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra)
+{
+    u8 spriteId;
+    struct MonIconSpriteTemplate iconTemplate =
+        {
+            .oam = &sMonIconOamData,
+            .image = GetMonIconPtr(species, personality, extra),
+            .anims = sMonIconAnims,
+            .affineAnims = sMonIconAffineAnims,
+            .callback = callback,
+            .paletteTag = POKE_ICON_BASE_PAL_TAG + gMonIconPaletteIndices[species],
+        };
+
+    if (species > NUM_SPECIES)
+        iconTemplate.paletteTag = POKE_ICON_BASE_PAL_TAG;
+
+    spriteId = CreateMonIconSprite(&iconTemplate, x, y, subpriority);
+
+    UpdateMonIconFrame(&gSprites[spriteId]);
+
+    return spriteId;
+}
+
+u8 CreateMonIcon_HandleDeoxys(u16 species, SpriteCallback callback, s16 x, s16 y, u8 subpriority, bool32 extra)
+{
+    u8 spriteId;
+    struct MonIconSpriteTemplate iconTemplate =
+        {
+            .oam = &sMonIconOamData,
+            .image = NULL,
+            .anims = sMonIconAnims,
+            .affineAnims = sMonIconAffineAnims,
+            .callback = callback,
+            .paletteTag = POKE_ICON_BASE_PAL_TAG + gMonIconPaletteIndices[species],
+        };
+
+    iconTemplate.image = GetMonIconTiles(species, extra);
+    spriteId = CreateMonIconSprite(&iconTemplate, x, y, subpriority);
+
+    UpdateMonIconFrame(&gSprites[spriteId]);
+
+    return spriteId;
+}
+
+u16 GetIconSpecies(u16 species, u32 personality)
+{
+    u16 result;
+
+    if (species == SPECIES_UNOWN)
+    {
+        u16 letter = GetUnownLetterByPersonality(personality);
+        if (letter == 0)
+            letter = SPECIES_UNOWN;
+        else
+            letter += (SPECIES_UNOWN_B - 1);
+        result = letter;
+    }
+    else
+    {
+        if (species > NUM_SPECIES)
+            result = SPECIES_NONE;
+        else
+            result = species;
+    }
+
+    return result;
+}
+
+u16 GetUnownLetterByPersonality(u32 personality)
+{
+    if (!personality)
+        return 0;
+    else
+        return (((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | (personality & 0x3)) % 0x1C;
+}
+
+u16 MailSpeciesToIconSpecies(u16 species)
+{
+    u16 value;
+
+    if (MailSpeciesToSpecies(species, &value) == SPECIES_UNOWN)
+    {
+        if (value == 0)
+            value += SPECIES_UNOWN;
+        else
+            value += (SPECIES_UNOWN_B - 1);
+        return value;
+    }
+    else
+    {
+        if (species > (SPECIES_UNOWN_B - 1))
+            species = SPECIES_NONE;
+        return GetIconSpecies(species, 0);
+    }
+}
+
+const u8 *GetMonIconTiles(u16 species, bool32 extra)
+{
+    const u8 *iconSprite = gMonIconTable[species];
+    if (species == SPECIES_DEOXYS && extra == TRUE)
+        iconSprite += 0x400;
+    return iconSprite;
+}
+
+const u8 *GetMonIconPtr(u16 species, u32 personality, bool32 extra)
+{
+    return GetMonIconTiles(GetIconSpecies(species, personality), extra);
+}
+
+void DestroyMonIcon(struct Sprite * sprite)
+{
+    DestroyMonIconInternal(sprite);
+}
+
+void LoadMonIconPalettes(void)
+{
+    u8 i;
+    for (i = 0; i < NELEMS(gMonIconPaletteTable); i++)
+        LoadSpritePalette(&gMonIconPaletteTable[i]);
+}
+
+void SafeLoadMonIconPalette(u16 species)
+{
+    u8 palIndex;
+    if (species > NUM_SPECIES)
+        species = SPECIES_NONE;
+    palIndex = gMonIconPaletteIndices[species];
+    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF)
+        LoadSpritePalette(&gMonIconPaletteTable[palIndex]);
+}
+
+void LoadMonIconPalette(u16 species)
+{
+    u8 palIndex;
+    palIndex = gMonIconPaletteIndices[species];
+    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF)
+        LoadSpritePalette(&gMonIconPaletteTable[palIndex]);
+}
+
+void FreeMonIconPalettes(void)
+{
+    u8 i;
+    for (i = 0; i < 6; i++)
+        FreeSpritePaletteByTag(gMonIconPaletteTable[i].tag);
+}
+
+void SafeFreeMonIconPalette(u16 species)
+{
+    u8 palIndex;
+    if (species > NUM_SPECIES)
+        species = SPECIES_NONE;
+    palIndex = gMonIconPaletteIndices[species];
+    FreeSpritePaletteByTag(gMonIconPaletteTable[palIndex].tag);
+}
+
+void FreeMonIconPalette(u16 species)
+{
+    u8 palIndex;
+    palIndex = gMonIconPaletteIndices[species];
+    FreeSpritePaletteByTag(gMonIconPaletteTable[palIndex].tag);
+}
+
+void SpriteCB_MonIcon(struct Sprite * sprite)
+{
+    UpdateMonIconFrame(sprite);
+}
+
+void LoadMonIconPalettesAt(u16 offset)
+{
+    int i;
+    if (offset <= 0x100 - 0x60)
+    {
+        for (i = 0; i < (int)NELEMS(gMonIconPaletteTable); i++)
+        {
+            LoadPalette(gMonIconPaletteTable[i].data, offset, 0x20);
+            offset += 0x10;
+        }
+    }
+}
+
+const u16 *GetValidMonIconPalettePtr(u16 species)
+{
+    if (species > NUM_SPECIES)
+        species = SPECIES_NONE;
+    return gMonIconPaletteTable[gMonIconPaletteIndices[species]].data;
+}
+
+u8 GetValidMonIconPalIndex(u16 species)
+{
+    if (species > NUM_SPECIES)
+        species = SPECIES_NONE;
+    return gMonIconPaletteIndices[species];
+}
+
+u8 GetMonIconPaletteIndexFromSpecies(u16 species)
+{
+    return gMonIconPaletteIndices[species];
+}
+
+u8 UpdateMonIconFrame(struct Sprite * sprite)
+{
+    u8 result = 0;
+
+    if (sprite->animDelayCounter == 0)
+    {
+        s16 frame = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.imageValue;
+
+        switch (frame)
+        {
+        case -1:
+            break;
+        case -2:
+            sprite->animCmdIndex = 0;
+            break;
+        default:
+            RequestSpriteCopy(
+                // pointer arithmetic is needed to get the correct pointer to perform the sprite copy on.
+                // because sprite->images is a struct def, it has to be casted to (u8 *) before any
+                // arithmetic can be performed.
+                (u8 *)sprite->images + (sSpriteImageSizes[sprite->oam.shape][sprite->oam.size] * frame),
+                (u8 *)(OBJ_VRAM0 + sprite->oam.tileNum * TILE_SIZE_4BPP),
+                sSpriteImageSizes[sprite->oam.shape][sprite->oam.size]);
+            sprite->animDelayCounter = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration & 0xFF;
+            sprite->animCmdIndex++;
+            result = sprite->animCmdIndex;
+            break;
+        }
+    }
+    else
+    {
+        sprite->animDelayCounter--;
+    }
+    return result;
+}
+
+static u8 CreateMonIconSprite(const struct MonIconSpriteTemplate * iconTemplate, s16 x, s16 y, u8 subpriority)
+{
+    u8 spriteId;
+
+    struct SpriteFrameImage image = { NULL, sSpriteImageSizes[iconTemplate->oam->shape][iconTemplate->oam->size] };
+
+    struct SpriteTemplate spriteTemplate =
+    {
+        .tileTag = SPRITE_INVALID_TAG,
+        .paletteTag = iconTemplate->paletteTag,
+        .oam = iconTemplate->oam,
+        .anims = iconTemplate->anims,
+        .images = &image,
+        .affineAnims = iconTemplate->affineAnims,
+        .callback = iconTemplate->callback,
+    };
+
+    spriteId = CreateSprite(&spriteTemplate, x, y, subpriority);
+    gSprites[spriteId].animPaused = TRUE;
+    gSprites[spriteId].animBeginning = FALSE;
+    gSprites[spriteId].images = (const struct SpriteFrameImage *)iconTemplate->image;
+    return spriteId;
+}
+
+static void DestroyMonIconInternal(struct Sprite * sprite)
+{
+    struct SpriteFrameImage image = { NULL, sSpriteImageSizes[sprite->oam.shape][sprite->oam.size] };
+    sprite->images = &image;
+    DestroySprite(sprite);
+}
+
+void MonIcon_SetAnim(struct Sprite * sprite, u8 animNum)
+{
+    sprite->animNum = animNum;
+    sprite->animDelayCounter = 0;
+    sprite->animCmdIndex = 0;
+}