Decompile pokemon icon

asm/battle_anim_80A5C6C.s

@@ -1224,7 +1224,7 @@ _080A65D8:
 	bl sub_80A62DC
 _080A65DE:
 	adds r0, r4, 0
-	bl sub_80D30DC
+	bl UpdateMonIconFrame
 	pop {r4}
 	pop {r0}
 	bx r0

asm/battle_frontier_1.s

@@ -3326,7 +3326,7 @@ _0819064A:
 	adds r6, 0x1
 	cmp r6, 0xF
 	ble _0819064A
-	bl sub_80D2F04
+	bl LoadMonIconPalettes
 	ldr r0, =sub_8190CD4
 	movs r1, 0
 	bl CreateTask
@@ -3695,7 +3695,7 @@ sub_8190938: @ 8190938
 	cmp r0, 0
 	bne _0819094A
 	adds r0, r1, 0
-	bl sub_80D30DC
+	bl UpdateMonIconFrame
 _0819094A:
 	pop {r0}
 	bx r0
@@ -3710,7 +3710,7 @@ sub_8190950: @ 8190950
 	cmp r0, 0
 	bne _08190962
 	adds r0, r4, 0
-	bl sub_80D30DC
+	bl UpdateMonIconFrame
 _08190962:
 	ldrh r0, [r4, 0x22]
 	adds r1, r0, 0x4
@@ -3774,7 +3774,7 @@ sub_81909CC: @ 81909CC
 	cmp r0, 0
 	bne _081909DE
 	adds r0, r4, 0
-	bl sub_80D30DC
+	bl UpdateMonIconFrame
 _081909DE:
 	ldrh r0, [r4, 0x22]
 	subs r1, r0, 0x4
@@ -3838,7 +3838,7 @@ sub_8190A48: @ 8190A48
 	cmp r0, 0
 	bne _08190A5A
 	adds r0, r4, 0
-	bl sub_80D30DC
+	bl UpdateMonIconFrame
 _08190A5A:
 	ldrh r0, [r4, 0x20]
 	adds r1, r0, 0x4
@@ -3902,7 +3902,7 @@ sub_8190AC4: @ 8190AC4
 	cmp r0, 0
 	bne _08190AD6
 	adds r0, r4, 0
-	bl sub_80D30DC
+	bl UpdateMonIconFrame
 _08190AD6:
 	ldrh r0, [r4, 0x20]
 	subs r1, r0, 0x4
@@ -6471,7 +6471,7 @@ _0819218E:
 	adds r6, 0x1
 	cmp r6, 0xF
 	ble _08192158
-	bl sub_80D2F9C
+	bl FreeMonIconPalettes
 	ldr r4, =gUnknown_0203CD78
 	ldr r0, [r4]
 	bl Free

asm/party_menu.s

@@ -410,7 +410,7 @@ _081B03A6:
 	b _081B048C
 	.pool
 _081B03B8:
-	bl sub_80D2F04
+	bl LoadMonIconPalettes
 	b _081B0484
 _081B03BE:
 	bl party_menu_add_per_mon_objects
@@ -10793,7 +10793,7 @@ _081B5BD0:
 sub_81B5BDC: @ 81B5BDC
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80D30DC
+	bl UpdateMonIconFrame
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0
@@ -10817,7 +10817,7 @@ _081B5C02:
 	thumb_func_start sub_81B5C08
 sub_81B5C08: @ 81B5C08
 	push {lr}
-	bl sub_80D30DC
+	bl UpdateMonIconFrame
 	pop {r0}
 	bx r0
 	thumb_func_end sub_81B5C08

asm/pokemon_icon.s

@@ -1,822 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start CreateMonIcon
-@ int CreateMonIcon(u16 speciesId, int a2, u16 a3, u16 a4, u8 a5, u32 personality, int a7)
-CreateMonIcon: @ 80D2CC4
-	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, =sMonIconOamData
-	str r0, [sp, 0x18]
-	adds r0, r4, 0
-	adds r2, r5, 0
-	bl GetMonIconPtr
-	str r0, [sp, 0x1C]
-	ldr r0, =sMonIconAnims
-	str r0, [sp, 0x20]
-	ldr r0, =sMonIconAffineAnims
-	str r0, [sp, 0x24]
-	str r6, [sp, 0x28]
-	ldr r0, =gMonIconPaletteIndices
-	adds r0, r4, r0
-	ldr r1, =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 _080D2D2A
-	mov r0, sp
-	strh r5, [r0, 0x14]
-_080D2D2A:
-	mov r0, r8
-	lsls r1, r0, 16
-	asrs r1, 16
-	lsls r2, r7, 16
-	asrs r2, 16
-	mov r0, sp
-	mov r3, r9
-	bl sub_80D31B4
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r0, r4, 4
-	adds r0, r4
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r0, r1
-	bl sub_80D30DC
-	adds r0, r4, 0
-	add sp, 0x30
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end CreateMonIcon
-
-	thumb_func_start sub_80D2D78
-sub_80D2D78: @ 80D2D78
-	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, =sMonIconOamData
-	str r2, [sp]
-	movs r2, 0
-	str r2, [sp, 0x4]
-	ldr r2, =sMonIconAnims
-	str r2, [sp, 0x8]
-	ldr r2, =sMonIconAffineAnims
-	str r2, [sp, 0xC]
-	str r1, [sp, 0x10]
-	ldr r2, =gMonIconPaletteIndices
-	adds r2, r0, r2
-	ldr r7, =0x0000dac0
-	adds r1, r7, 0
-	ldrb r2, [r2]
-	adds r1, r2
-	strh r1, [r3, 0x14]
-	ldr r1, [sp, 0x30]
-	bl GetMonIconTiles
-	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 sub_80D31B4
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r0, r4, 4
-	adds r0, r4
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r0, r1
-	bl sub_80D30DC
-	adds r0, r4, 0
-	add sp, 0x18
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80D2D78
-
-	thumb_func_start mon_icon_convert_unown_species_id
-@ u16 mon_icon_convert_unown_species_id(u16 speciesId, u32 personality)
-mon_icon_convert_unown_species_id: @ 80D2E08
-	push {lr}
-	lsls r0, 16
-	lsrs r2, r0, 16
-	cmp r2, 0xC9
-	bne _080D2E32
-	adds r0, r1, 0
-	bl GetUnownLetterByPersonality
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0
-	bne _080D2E24
-	movs r0, 0xC9
-	b _080D2E2E
-_080D2E24:
-	movs r1, 0xCE
-	lsls r1, 1
-	adds r0, r1
-	lsls r0, 16
-	lsrs r0, 16
-_080D2E2E:
-	adds r1, r0, 0
-	b _080D2E40
-_080D2E32:
-	movs r0, 0xCE
-	lsls r0, 1
-	adds r1, r2, 0
-	cmp r1, r0
-	bls _080D2E40
-	movs r1, 0x82
-	lsls r1, 1
-_080D2E40:
-	adds r0, r1, 0
-	pop {r1}
-	bx r1
-	thumb_func_end mon_icon_convert_unown_species_id
-
-	thumb_func_start GetUnownLetterByPersonality
-GetUnownLetterByPersonality: @ 80D2E48
-	push {lr}
-	adds r2, r0, 0
-	cmp r2, 0
-	beq _080D2E7E
-	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 _080D2E80
-_080D2E7E:
-	movs r0, 0
-_080D2E80:
-	pop {r1}
-	bx r1
-	thumb_func_end GetUnownLetterByPersonality
-
-	thumb_func_start sub_80D2E84
-sub_80D2E84: @ 80D2E84
-	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 _080D2EBA
-	mov r0, sp
-	ldrh r0, [r0]
-	cmp r0, 0
-	bne _080D2EAA
-	mov r1, sp
-	adds r0, 0xC9
-	b _080D2EB2
-_080D2EAA:
-	mov r1, sp
-	movs r2, 0xCE
-	lsls r2, 1
-	adds r0, r2
-_080D2EB2:
-	strh r0, [r1]
-	mov r0, sp
-	ldrh r0, [r0]
-	b _080D2ED2
-_080D2EBA:
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r4, r0
-	bls _080D2EC6
-	movs r4, 0x82
-	lsls r4, 1
-_080D2EC6:
-	adds r0, r4, 0
-	movs r1, 0
-	bl mon_icon_convert_unown_species_id
-	lsls r0, 16
-	lsrs r0, 16
-_080D2ED2:
-	add sp, 0x4
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80D2E84
-
-	thumb_func_start GetMonIconPtr
-@ void *GetMonIconPtr(u16 speciesId, u32 personality, bool32)
-GetMonIconPtr: @ 80D2EDC
-	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 GetMonIconTiles
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end GetMonIconPtr
-
-	thumb_func_start sub_80D2EF8
-sub_80D2EF8: @ 80D2EF8
-	push {lr}
-	bl sub_80D328C
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D2EF8
-
-	thumb_func_start sub_80D2F04
-sub_80D2F04: @ 80D2F04
-	push {r4,r5,lr}
-	movs r4, 0
-	ldr r5, =gMonIconPaletteTable
-_080D2F0A:
-	lsls r0, r4, 3
-	adds r0, r5
-	bl LoadSpritePalette
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x5
-	bls _080D2F0A
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80D2F04
-
-	thumb_func_start sub_80D2F28
-sub_80D2F28: @ 80D2F28
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r1, r0, 16
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r1, r0
-	bls _080D2F3A
-	movs r1, 0x82
-	lsls r1, 1
-_080D2F3A:
-	ldr r0, =gMonIconPaletteIndices
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	ldr r1, =gMonIconPaletteTable
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x4]
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xFF
-	bne _080D2F5A
-	adds r0, r4, 0
-	bl LoadSpritePalette
-_080D2F5A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80D2F28
-
-	thumb_func_start sub_80D2F68
-sub_80D2F68: @ 80D2F68
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r1, =gMonIconPaletteIndices
-	adds r0, r1
-	ldrb r0, [r0]
-	ldr r1, =gMonIconPaletteTable
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x4]
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xFF
-	bne _080D2F8E
-	adds r0, r4, 0
-	bl LoadSpritePalette
-_080D2F8E:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80D2F68
-
-	thumb_func_start sub_80D2F9C
-sub_80D2F9C: @ 80D2F9C
-	push {r4,r5,lr}
-	movs r4, 0
-	ldr r5, =gMonIconPaletteTable
-_080D2FA2:
-	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 _080D2FA2
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80D2F9C
-
-	thumb_func_start sub_80D2FC0
-sub_80D2FC0: @ 80D2FC0
-	push {lr}
-	lsls r0, 16
-	lsrs r1, r0, 16
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r1, r0
-	bls _080D2FD2
-	movs r1, 0x82
-	lsls r1, 1
-_080D2FD2:
-	ldr r0, =gMonIconPaletteIndices
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	ldr r1, =gMonIconPaletteTable
-	lsls r0, 3
-	adds r0, r1
-	ldrh r0, [r0, 0x4]
-	bl FreeSpritePaletteByTag
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80D2FC0
-
-	thumb_func_start sub_80D2FF0
-sub_80D2FF0: @ 80D2FF0
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r1, =gMonIconPaletteIndices
-	adds r0, r1
-	ldrb r0, [r0]
-	ldr r1, =gMonIconPaletteTable
-	lsls r0, 3
-	adds r0, r1
-	ldrh r0, [r0, 0x4]
-	bl FreeSpritePaletteByTag
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80D2FF0
-
-	thumb_func_start sub_80D3014
-sub_80D3014: @ 80D3014
-	push {lr}
-	bl sub_80D30DC
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D3014
-
-	thumb_func_start GetMonIconTiles
-@ void *GetMonIconTiles(u16 speciesId, bool32)
-GetMonIconTiles: @ 80D3020
-	push {lr}
-	adds r3, r1, 0
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r2, =gMonIconTable
-	lsls r1, r0, 2
-	adds r1, r2
-	ldr r2, [r1]
-	movs r1, 0xCD
-	lsls r1, 1
-	cmp r0, r1
-	bne _080D3042
-	cmp r3, 0x1
-	bne _080D3042
-	movs r0, 0x80
-	lsls r0, 3
-	adds r2, r0
-_080D3042:
-	adds r0, r2, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end GetMonIconTiles
-
-	thumb_func_start sub_80D304C
-sub_80D304C: @ 80D304C
-	push {r4-r6,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0xA0
-	bhi _080D3074
-	ldr r6, =gMonIconPaletteTable
-	movs r5, 0x5
-_080D305A:
-	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 _080D305A
-_080D3074:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80D304C
-
-	thumb_func_start sub_80D3080
-sub_80D3080: @ 80D3080
-	push {lr}
-	lsls r0, 16
-	lsrs r1, r0, 16
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r1, r0
-	bls _080D3092
-	movs r1, 0x82
-	lsls r1, 1
-_080D3092:
-	ldr r0, =gMonIconPaletteIndices
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80D3080
-
-	thumb_func_start sub_80D30A0
-sub_80D30A0: @ 80D30A0
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r1, =gMonIconPaletteIndices
-	adds r0, r1
-	ldrb r0, [r0]
-	bx lr
-	.pool
-	thumb_func_end sub_80D30A0
-
-	thumb_func_start GetValidMonIconPalettePtr
-GetValidMonIconPalettePtr: @ 80D30B0
-	push {lr}
-	lsls r0, 16
-	lsrs r2, r0, 16
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r2, r0
-	bls _080D30C2
-	movs r2, 0x82
-	lsls r2, 1
-_080D30C2:
-	ldr r1, =gMonIconPaletteTable
-	ldr r0, =gMonIconPaletteIndices
-	adds r0, r2, r0
-	ldrb r0, [r0]
-	lsls r0, 3
-	adds r0, r1
-	ldr r0, [r0]
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end GetValidMonIconPalettePtr
-
-	thumb_func_start sub_80D30DC
-sub_80D30DC: @ 80D30DC
-	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 _080D3190
-	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 _080D3126
-	adds r0, 0x1
-	cmp r3, r0
-	bne _080D312A
-	b _080D31A4
-_080D3126:
-	strb r7, [r5]
-	b _080D31A4
-_080D312A:
-	ldr r2, =sSpriteImageSizes
-	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, =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 _080D31A4
-	.pool
-_080D3190:
-	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]
-_080D31A4:
-	adds r0, r7, 0
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80D30DC
-
-	thumb_func_start sub_80D31B4
-sub_80D31B4: @ 80D31B4
-	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, =sSpriteImageSizes
-	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, =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, =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, =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
-	.pool
-	thumb_func_end sub_80D31B4
-
-	thumb_func_start sub_80D328C
-sub_80D328C: @ 80D328C
-	push {lr}
-	sub sp, 0x8
-	movs r1, 0
-	str r1, [sp]
-	ldr r3, =sSpriteImageSizes
-	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, =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
-	.pool
-	thumb_func_end sub_80D328C
-
-	thumb_func_start sub_80D32C8
-sub_80D32C8: @ 80D32C8
-	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_80D32C8
-
-	.align 2, 0 @ Don't pad with nop.

asm/pokemon_storage_system.s

@@ -7034,7 +7034,7 @@ _080CAEFA:
 	thumb_func_start sub_80CAF04
 sub_80CAF04: @ 80CAF04
 	push {r4-r6,lr}
-	bl sub_80D2F04
+	bl LoadMonIconPalettes
 	movs r2, 0
 	ldr r3, =gUnknown_02039D08
 	ldr r5, =0x00000b08

asm/rom_8011DC0.s

@@ -17828,7 +17828,7 @@ _0801BD1A:
 	bl CopyBgTilemapBufferToVram
 	b _0801BD86
 _0801BD34:
-	bl sub_80D2F04
+	bl LoadMonIconPalettes
 	b _0801BD86
 _0801BD3A:
 	movs r0, 0x1
@@ -17991,7 +17991,7 @@ _0801BE56:
 	.pool
 _0801BE94:
 	bl sub_801C61C
-	bl sub_80D2F9C
+	bl FreeMonIconPalettes
 	b _0801BEDA
 _0801BE9E:
 	ldr r0, =gUnknown_02022C60

asm/trade.s

@@ -246,7 +246,7 @@ _08077310:
 	movs r1, 0x1
 	movs r2, 0xE0
 	bl sub_809882C
-	bl sub_80D2F04
+	bl LoadMonIconPalettes
 	ldr r2, =gUnknown_0203229C
 	ldr r0, [r2]
 	adds r0, 0x69

include/pokemon_icon.h

@@ -1,15 +1,20 @@
 #ifndef GUARD_POKEMON_ICON_H
 #define GUARD_POKEMON_ICON_H
 
+const u8 *GetMonIconTiles(u16 species, bool32);
 const u8 *GetMonIconPtr(u16 speciesId, u32 personality, u32 frameNo);
 const u16 *GetValidMonIconPalettePtr(u16 speciesId);
 u16 GetUnownLetterByPersonality(u32 personality);
 u16 sub_80D2E84(u16 speciesId);
-void sub_80D2F04(void);
+void LoadMonIconPalettes(void);
-void sub_80D2F68(u16 iconId);
+void LoadMonIconPalette(u16 species);
-u8 sub_80D2D78(u16 iconId, void callback(struct Sprite *), u16 x, u16 y, u16 a4, u8 a5);
+void FreeMonIconPalettes(void);
-void sub_80D2FF0(u16 iconId);
+u8 sub_80D2D78(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, bool32 extra);
+void FreeMonIconPalette(u16 species);
 void sub_80D2EF8(struct Sprite *sprite);
-u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality, int a7);
+u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra);
+u8 UpdateMonIconFrame(struct Sprite *sprite);
+void LoadMonIconPalette(u16 species);
+void sub_80D328C(struct Sprite *sprite);
 
 #endif // GUARD_POKEMON_ICON_H

ld_script.txt

@@ -130,7 +130,6 @@ SECTIONS {
         src/pokemon_storage_system.o(.text);
         asm/pokemon_storage_system.o(.text);
         src/pokemon_icon.o(.text);
-        asm/pokemon_icon.o(.text);
         src/script_movement.o(.text);
         asm/fldeff_cut.o(.text);
         src/mail_data.o(.text);

src/mail.c

@@ -403,11 +403,11 @@ static bool8 MailReadBuildGraphics(void)
             switch (sMailRead->animsActive)
             {
                 case 1:
-                    sub_80D2F68(icon);
+                    LoadMonIconPalette(icon);
                     sMailRead->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x60, 0x80, 0, 0);
                     break;
                 case 2:
-                    sub_80D2F68(icon);
+                    LoadMonIconPalette(icon);
                     sMailRead->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x28, 0x80, 0, 0);
                     break;
             }
@@ -540,7 +540,7 @@ static void CB2_ExitMailReadFreeVars(void)
         {
             case 1:
             case 2:
-                sub_80D2FF0(sub_80D2E84(sMailRead->mail->species));
+                FreeMonIconPalette(sub_80D2E84(sMailRead->mail->species));
                 sub_80D2EF8(&gSprites[sMailRead->monIconSprite]);
         }
         memset(sMailRead, 0, sizeof(*sMailRead));

src/naming_screen.c

@@ -1160,7 +1160,7 @@ static void NamingScreen_CreateMonIcon(void)
 {
     u8 spriteId;
 
-    sub_80D2F04();
+    LoadMonIconPalettes();
     spriteId = CreateMonIcon(gNamingScreenData->monSpecies, SpriteCallbackDummy, 0x38, 0x28, 0, gNamingScreenData->monPersonality, 1);
     gSprites[spriteId].oam.priority = 3;
 }

src/pokemon_icon.c

@@ -1,9 +1,28 @@
 #include "global.h"
 #include "sprite.h"
+#include "mail.h"
 #include "graphics.h"
+#include "constants/species.h"
+#include "palette.h"
+#include "pokemon_icon.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;
+    void (*callback)(struct Sprite *);
+    u16 paletteTag;
+};
+
+// static functions
+static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *, s16, s16, u8);
+
+// .rodata
+
 const u8 * const gMonIconTable[] =
 {
     gMonIcon_Bulbasaur,
@@ -1012,3 +1031,288 @@ const u16 sSpriteImageSizes[3][4] =
         0x400, // 4×8
     },
 };
+
+u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), 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 > SPECIES_EGG)
+        iconTemplate.paletteTag = POKE_ICON_BASE_PAL_TAG;
+
+    spriteId = CreateMonIconSprite(&iconTemplate, x, y, subpriority);
+
+    UpdateMonIconFrame(&gSprites[spriteId]);
+
+    return spriteId;
+}
+
+u8 sub_80D2D78(u16 species, void (*callback)(struct Sprite *), 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 mon_icon_convert_unown_species_id(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 > SPECIES_EGG)
+            result = 260;
+        else
+            result = species;
+    }
+
+    return result;
+}
+
+u16 GetUnownLetterByPersonality(u32 personality)
+{
+    if (!personality)
+        return 0;
+    return (((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | (personality & 0x3)) % 0x1C;
+}
+
+u16 sub_80D2E84(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 = 260;
+        return mon_icon_convert_unown_species_id(species, 0);
+    }
+}
+
+const u8 *GetMonIconPtr(u16 species, u32 personality, bool32 extra)
+{
+    return GetMonIconTiles(mon_icon_convert_unown_species_id(species, personality), extra);
+}
+
+
+
+void sub_80D2EF8(struct Sprite *sprite)
+{
+    sub_80D328C(sprite);
+}
+
+void LoadMonIconPalettes(void)
+{
+    u8 i;
+    for (i = 0; i < 6; i++)
+        LoadSpritePalette(&gMonIconPaletteTable[i]);
+}
+
+// unused
+void SafeLoadMonIconPalette(u16 species)
+{
+    u8 palIndex;
+    if (species > SPECIES_EGG)
+        species = 260;
+    palIndex = gMonIconPaletteIndices[species];
+    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF)
+        LoadSpritePalette(&gMonIconPaletteTable[palIndex]);
+}
+
+void LoadMonIconPalette(u16 species)
+{
+    u8 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);
+}
+
+// unused
+void SafeFreeMonIconPalette(u16 species)
+{
+    u8 palIndex;
+    if (species > SPECIES_EGG)
+        species = 260;
+    palIndex = gMonIconPaletteIndices[species];
+    FreeSpritePaletteByTag(gMonIconPaletteTable[palIndex].tag);
+}
+
+void FreeMonIconPalette(u16 species)
+{
+    u8 palIndex;
+    palIndex = gMonIconPaletteIndices[species];
+    FreeSpritePaletteByTag(gMonIconPaletteTable[palIndex].tag);
+}
+
+void sub_80D3014(struct Sprite *sprite)
+{
+    UpdateMonIconFrame(sprite);
+}
+
+const u8* GetMonIconTiles(u16 species, bool32 extra)
+{
+    const u8* iconSprite = gMonIconTable[species];
+    if(species == SPECIES_DEOXYS && extra == TRUE)
+    {
+        iconSprite = (const u8*)(0x400 + (u32)iconSprite); //WTF?
+    }
+    return iconSprite;
+}
+
+void sub_80D304C(u16 offset)
+{
+    s32 i;
+    const struct SpritePalette* monIconPalettePtr;
+
+    if(offset <= 0xA0)
+    {
+        monIconPalettePtr = gMonIconPaletteTable;
+        for(i = 5; i >= 0 ; i--)
+        {
+            LoadPalette(monIconPalettePtr->data, offset, 0x20);
+            offset += 0x10;
+            monIconPalettePtr++;
+        }
+    }
+}
+
+u8 sub_80D3080(u16 species)
+{
+    if (species > SPECIES_EGG)
+        species = 260;
+    return gMonIconPaletteIndices[species];
+}
+
+u8 sub_80D30A0(u16 species)
+{
+    return gMonIconPaletteIndices[species];
+}
+
+const u16* GetValidMonIconPalettePtr(u16 species)
+{
+    if (species > SPECIES_EGG)
+        species = 260;
+    return gMonIconPaletteTable[gMonIconPaletteIndices[species]].data;
+}
+
+// TODO: try to find a way to avoid using asm statement
+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]);
+            {
+                register u8 duration asm("r0") = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration;
+                sprite->animDelayCounter = duration;
+            }
+            sprite->animCmdIndex++;
+            result = sprite->animCmdIndex;
+            break;
+        }
+    }
+    else
+    {
+        sprite->animDelayCounter--;
+    }
+    return result;
+}
+
+static u8 CreateMonIconSprite(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 = 0xFFFF,
+        .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;
+}
+
+void sub_80D328C(struct Sprite *sprite)
+{
+    struct SpriteFrameImage image = { NULL, sSpriteImageSizes[sprite->oam.shape][sprite->oam.size] };
+    sprite->images = &image;
+    DestroySprite(sprite);
+}
+
+void sub_80D32C8(struct Sprite *sprite, u8 animNum)
+{
+    sprite->animNum = animNum;
+    sprite->animDelayCounter = 0;
+    sprite->animCmdIndex = 0;
+}