Start decompiling the second half of pokemon_summary_screen

1 files changed, 2 insertions, 382 deletions

diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index dddc31fd8..257ab1345 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -4897,9 +4897,9 @@ _0809FF6A:
 	lsrs r0, 16
 	movs r1, 0xB
 	movs r2, 0x4
-	bl sub_80A0BF4
+	bl PrintHeldItemName
 	adds r0, r5, 0
-	bl sub_80A0B88
+	bl PrintNumRibbons
 	ldr r4, _080A008C @ =gStringVar1
 	adds r0, r5, 0
 	movs r1, 0x19
@@ -5741,386 +5741,6 @@ _080A0660: .4byte 0x0000103d
 
     .section .text_80A0958
 
-	thumb_func_start sub_80A0958
-sub_80A0958: @ 80A0958
-	push {r4-r6,lr}
-	mov r6, r10
-	mov r5, r9
-	mov r4, r8
-	push {r4-r6}
-	mov r8, r0
-	movs r1, 0xB
-	bl GetMonData
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	ldr r2, _080A0A24 @ =gStringVar1
-	adds r0, r2, 0
-	movs r1, 0xD
-	bl sub_80A1E58
-	adds r2, r0, 0
-	movs r6, 0xFC
-	strb r6, [r2]
-	movs r0, 0x11
-	strb r0, [r2, 0x1]
-	movs r0, 0x7
-	strb r0, [r2, 0x2]
-	movs r0, 0xBA
-	strb r0, [r2, 0x3]
-	adds r2, 0x4
-	movs r0, 0xB
-	adds r1, r4, 0
-	muls r1, r0
-	ldr r0, _080A0A28 @ =gSpeciesNames
-	adds r1, r0
-	adds r0, r2, 0
-	bl StringCopy
-	adds r2, r0, 0
-	strb r6, [r2]
-	movs r0, 0x13
-	mov r10, r0
-	strb r0, [r2, 0x1]
-	movs r0, 0x50
-	strb r0, [r2, 0x2]
-	movs r0, 0xFF
-	mov r9, r0
-	strb r0, [r2, 0x3]
-	ldr r5, _080A0A24 @ =gStringVar1
-	adds r0, r5, 0
-	movs r1, 0
-	movs r2, 0xE
-	bl MenuPrint
-	movs r0, 0x3
-	movs r1, 0x10
-	movs r2, 0x9
-	movs r3, 0x11
-	bl MenuZeroFillWindowRect
-	mov r0, r8
-	movs r1, 0x38
-	bl GetMonData
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0xD
-	bl sub_80A1E58
-	adds r2, r0, 0
-	movs r0, 0x34
-	strb r0, [r2]
-	adds r2, 0x1
-	adds r0, r2, 0
-	adds r1, r4, 0
-	bl ConvertIntToDecimalString
-	adds r2, r0, 0
-	strb r6, [r2]
-	mov r0, r10
-	strb r0, [r2, 0x1]
-	movs r0, 0x20
-	strb r0, [r2, 0x2]
-	mov r0, r9
-	strb r0, [r2, 0x3]
-	adds r0, r5, 0
-	movs r1, 0x3
-	movs r2, 0x10
-	bl MenuPrint
-	mov r0, r8
-	movs r1, 0x7
-	movs r2, 0x10
-	bl sub_80A0A2C
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A0A24: .4byte gStringVar1
-_080A0A28: .4byte gSpeciesNames
-	thumb_func_end sub_80A0958
-
-	thumb_func_start sub_80A0A2C
-sub_80A0A2C: @ 80A0A2C
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	lsls r1, 24
-	lsrs r5, r1, 24
-	lsls r2, 24
-	lsrs r4, r2, 24
-	movs r1, 0x41
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x20
-	beq _080A0A84
-	cmp r0, 0x1D
-	beq _080A0A84
-	adds r0, r6, 0
-	bl GetMonGender
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	beq _080A0A6E
-	cmp r0, 0xFE
-	beq _080A0A78
-	adds r3, r4, 0x1
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r5, 0
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl MenuZeroFillWindowRect
-	b _080A0A84
-_080A0A6E:
-	ldr r0, _080A0A74 @ =gOtherText_MaleSymbol2
-	movs r1, 0xB
-	b _080A0A7C
-	.align 2, 0
-_080A0A74: .4byte gOtherText_MaleSymbol2
-_080A0A78:
-	ldr r0, _080A0A8C @ =gOtherText_FemaleSymbolAndLv
-	movs r1, 0xC
-_080A0A7C:
-	adds r2, r5, 0
-	adds r3, r4, 0
-	bl sub_80A1FF8
-_080A0A84:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A0A8C: .4byte gOtherText_FemaleSymbolAndLv
-	thumb_func_end sub_80A0A2C
-
-	thumb_func_start sub_80A0A90
-sub_80A0A90: @ 80A0A90
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	movs r1, 0x32
-	bl GetMonData
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x33
-	bl GetMonData
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x34
-	bl GetMonData
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x35
-	bl GetMonData
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x36
-	bl GetMonData
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x43
-	bl GetMonData
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x44
-	bl GetMonData
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x45
-	bl GetMonData
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x46
-	bl GetMonData
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x47
-	bl GetMonData
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x48
-	bl GetMonData
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x49
-	bl GetMonData
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x4A
-	bl GetMonData
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x4B
-	bl GetMonData
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x4C
-	bl GetMonData
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x4D
-	bl GetMonData
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x4E
-	bl GetMonData
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r4, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80A0A90
-
-	thumb_func_start sub_80A0B88
-sub_80A0B88: @ 80A0B88
-	push {r4,r5,lr}
-	bl sub_80A0A90
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0
-	bne _080A0BA8
-	ldr r0, _080A0BA0 @ =gStringVar1
-	ldr r1, _080A0BA4 @ =gOtherText_None
-	bl StringCopy
-	b _080A0BD8
-	.align 2, 0
-_080A0BA0: .4byte gStringVar1
-_080A0BA4: .4byte gOtherText_None
-_080A0BA8:
-	ldr r4, _080A0BE8 @ =gStringVar1
-	ldr r1, _080A0BEC @ =gOtherText_Ribbons00
-	adds r0, r4, 0
-	bl StringCopy
-	adds r0, r4, 0
-	bl StringLength
-	lsls r0, 24
-	lsrs r0, 24
-	subs r4, 0x2
-	adds r0, r4
-	movs r1, 0xFC
-	strb r1, [r0]
-	movs r1, 0x14
-	strb r1, [r0, 0x1]
-	movs r1, 0x6
-	strb r1, [r0, 0x2]
-	adds r0, 0x3
-	adds r1, r5, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl ConvertIntToDecimalStringN
-_080A0BD8:
-	ldr r0, _080A0BF0 @ =gUnknown_083C15AE
-	movs r1, 0x15
-	movs r2, 0x4
-	bl MenuPrint
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A0BE8: .4byte gStringVar1
-_080A0BEC: .4byte gOtherText_Ribbons00
-_080A0BF0: .4byte gUnknown_083C15AE
-	thumb_func_end sub_80A0B88
-
-	thumb_func_start sub_80A0BF4
-sub_80A0BF4: @ 80A0BF4
-	push {r4-r7,lr}
-	lsls r0, 16
-	lsrs r5, r0, 16
-	lsls r1, 24
-	lsrs r7, r1, 24
-	lsls r2, 24
-	lsrs r6, r2, 24
-	cmp r5, 0xAF
-	bne _080A0C48
-	bl sub_80F9344
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080A0C48
-	bl IsLinkDoubleBattle
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080A0C48
-	ldr r0, _080A0C40 @ =gSharedMem + 0x18000
-	ldrb r0, [r0, 0x9]
-	cmp r0, 0x1
-	beq _080A0C2E
-	cmp r0, 0x4
-	beq _080A0C2E
-	cmp r0, 0x5
-	bne _080A0C48
-_080A0C2E:
-	ldr r4, _080A0C44 @ =gStringVar1
-	adds r0, r5, 0
-	bl ItemId_GetItem
-	adds r1, r0, 0
-	adds r0, r4, 0
-	bl StringCopy
-	b _080A0C68
-	.align 2, 0
-_080A0C40: .4byte gSharedMem + 0x18000
-_080A0C44: .4byte gStringVar1
-_080A0C48:
-	cmp r5, 0
-	bne _080A0C60
-	ldr r0, _080A0C58 @ =gStringVar1
-	ldr r1, _080A0C5C @ =gOtherText_None
-	bl StringCopy
-	b _080A0C68
-	.align 2, 0
-_080A0C58: .4byte gStringVar1
-_080A0C5C: .4byte gOtherText_None
-_080A0C60:
-	ldr r1, _080A0C78 @ =gStringVar1
-	adds r0, r5, 0
-	bl CopyItemName
-_080A0C68:
-	ldr r0, _080A0C7C @ =gUnknown_083C15B4
-	adds r1, r7, 0
-	adds r2, r6, 0
-	bl MenuPrint
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A0C78: .4byte gStringVar1
-_080A0C7C: .4byte gUnknown_083C15B4
-	thumb_func_end sub_80A0BF4
-
 	thumb_func_start sub_80A0C80
 sub_80A0C80: @ 80A0C80
 	push {r4-r7,lr}