Decompile party_menu functions

1 files changed, 4 insertions, 363 deletions

diff --git a/asm/party_menu.s b/asm/party_menu.s
index 1d51711f1..0edec1623 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -7446,82 +7446,9 @@ sub_806E81C: @ 806E81C
 	bx lr
 	thumb_func_end sub_806E81C
 
-	thumb_func_start sub_806E834
-sub_806E834: @ 806E834
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	lsls r4, r1, 24
-	lsrs r4, 24
-	ldr r1, _0806E878 @ =gUnknown_0202E8F6
-	movs r0, 0x1
-	strb r0, [r1]
-	movs r0, 0x3
-	movs r1, 0xE
-	movs r2, 0x1A
-	movs r3, 0x13
-	bl MenuDrawTextWindow
-	adds r0, r5, 0
-	movs r1, 0x4
-	movs r2, 0xF
-	bl MenuPrintMessage
-	ldr r0, _0806E87C @ =sub_806E884
-	movs r1, 0x1
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _0806E880 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	strh r4, [r1, 0x8]
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0806E878: .4byte gUnknown_0202E8F6
-_0806E87C: .4byte sub_806E884
-_0806E880: .4byte gTasks
-	thumb_func_end sub_806E834
+    .section .text_806E884
+
 
-	thumb_func_start sub_806E884
-sub_806E884: @ 806E884
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r5, r4, 0
-	bl MenuUpdateWindowText
-	lsls r0, 24
-	cmp r0, 0
-	beq _0806E8C0
-	ldr r1, _0806E8C8 @ =gUnknown_0202E8F6
-	movs r0, 0
-	strb r0, [r1]
-	ldr r1, _0806E8CC @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0x8
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bne _0806E8BA
-	movs r0, 0x3
-	movs r1, 0xE
-	movs r2, 0x1A
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-_0806E8BA:
-	adds r0, r5, 0
-	bl DestroyTask
-_0806E8C0:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806E8C8: .4byte gUnknown_0202E8F6
-_0806E8CC: .4byte gTasks
-	thumb_func_end sub_806E884
 
 	thumb_func_start sub_806E8D0
 sub_806E8D0: @ 806E8D0
@@ -10379,159 +10306,7 @@ _08070080: .4byte 0xfffff27e
 _08070084: .4byte 0xfffff280
 	thumb_func_end sub_8070048
 
-	thumb_func_start sub_8070088
-sub_8070088: @ 8070088
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _08070120 @ =gTasks
-	mov r10, r1
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	mov r2, r10
-	adds r7, r1, r2
-	ldr r5, _08070124 @ =TaskDummy
-	str r5, [r7]
-	ldr r4, _08070128 @ =0x0201c000
-	ldrb r0, [r4, 0x5]
-	movs r1, 0x64
-	mov r9, r1
-	mov r2, r9
-	muls r2, r0
-	adds r0, r2, 0
-	ldr r1, _0807012C @ =gPlayerParty
-	mov r8, r1
-	add r0, r8
-	movs r1, 0xB
-	bl GetMonData
-	cmp r0, 0
-	beq _08070118
-	adds r0, r5, 0
-	movs r1, 0x5
-	bl CreateTask
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	str r0, [sp]
-	mov r0, r10
-	adds r0, 0x8
-	ldr r2, [sp]
-	adds r6, r2, r0
-	ldrb r0, [r4, 0x5]
-	mov r1, r9
-	muls r1, r0
-	adds r0, r1, 0
-	add r0, r8
-	str r0, [r4]
-	movs r1, 0x3A
-	bl GetMonData
-	strh r0, [r6, 0x14]
-	ldr r0, [r4]
-	movs r1, 0x39
-	bl GetMonData
-	strh r0, [r6, 0x16]
-	ldrb r0, [r4, 0x5]
-	ldrh r1, [r4, 0x6]
-	movs r2, 0
-	bl ExecuteTableBasedItemEffect__
-	lsls r0, 24
-	cmp r0, 0
-	beq _08070134
-	adds r0, r5, 0
-	bl DestroyTask
-_08070118:
-	ldr r0, _08070130 @ =sub_80701DC
-	str r0, [r7]
-	b _080701B0
-	.align 2, 0
-_08070120: .4byte gTasks
-_08070124: .4byte TaskDummy
-_08070128: .4byte 0x0201c000
-_0807012C: .4byte gPlayerParty
-_08070130: .4byte sub_80701DC
-_08070134:
-	ldr r1, _080701C0 @ =gUnknown_0202E8F4
-	movs r0, 0x1
-	strb r0, [r1]
-	movs r0, 0x3
-	movs r1, 0xE
-	movs r2, 0x1A
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-	movs r0, 0x1
-	bl PlaySE
-	ldr r0, [r4]
-	ldrb r1, [r4, 0x5]
-	bl PartyMenuUpdateLevelOrStatus
-	bl IsDoubleBattle
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	ldrb r1, [r4, 0x5]
-	lsls r1, 1
-	adds r0, r1
-	ldr r1, _080701C4 @ =gUnknown_083769A8
-	adds r0, r1
-	movs r1, 0x9
-	bl task_pc_turn_off
-	ldr r2, _080701C8 @ =0xfffff261
-	adds r1, r4, r2
-	movs r0, 0x2
-	strb r0, [r1]
-	ldr r0, [r4]
-	movs r1, 0x39
-	bl GetMonData
-	ldrh r1, [r6, 0x16]
-	subs r0, r1
-	strh r0, [r6, 0x18]
-	movs r0, 0x1
-	strh r0, [r6, 0x1C]
-	ldr r1, _080701CC @ =0xfffff27e
-	adds r0, r4, r1
-	movs r1, 0x1
-	strh r1, [r0]
-	ldr r2, _080701D0 @ =0xfffff280
-	adds r0, r4, r2
-	strh r1, [r0]
-	ldrh r1, [r6, 0x16]
-	adds r2, 0x2
-	adds r0, r4, r2
-	strh r1, [r0]
-	ldr r0, _080701D4 @ =0xffff8000
-	str r0, [r4, 0xC]
-	ldr r1, [sp]
-	add r1, r10
-	ldr r0, _080701D8 @ =sub_806F8AC
-	str r0, [r1]
-_080701B0:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080701C0: .4byte gUnknown_0202E8F4
-_080701C4: .4byte gUnknown_083769A8
-_080701C8: .4byte 0xfffff261
-_080701CC: .4byte 0xfffff27e
-_080701D0: .4byte 0xfffff280
-_080701D4: .4byte 0xffff8000
-_080701D8: .4byte sub_806F8AC
-	thumb_func_end sub_8070088
+    .section .text_80701DC
 
 	thumb_func_start sub_80701DC
 sub_80701DC: @ 80701DC
@@ -11296,141 +11071,7 @@ _08070840: .4byte gTasks
 _08070844: .4byte Task_RareCandy3
 	thumb_func_end Task_RareCandy2
 
-	thumb_func_start sub_8070848
-sub_8070848: @ 8070848
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	movs r0, 0xB
-	movs r1, 0
-	movs r2, 0x1D
-	movs r3, 0x7
-	bl MenuDrawTextWindow
-	movs r7, 0
-	ldr r0, _080708E4 @ =gStringVar1
-	mov r10, r0
-_08070864:
-	ldr r1, _080708E8 @ =0x0201c000
-	ldr r0, [r1]
-	ldr r1, _080708EC @ =gUnknown_08376D1C
-	adds r1, r7, r1
-	ldrb r1, [r1]
-	bl GetMonData
-	adds r1, r7, 0x6
-	lsls r1, 1
-	ldr r2, _080708F0 @ =0x0201b264
-	adds r1, r2
-	strh r0, [r1]
-	lsls r4, r7, 1
-	adds r2, r4, r2
-	ldrh r1, [r2]
-	subs r0, r1
-	strh r0, [r2]
-	adds r0, r7, 0
-	movs r1, 0x3
-	bl __udivsi3
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 3
-	adds r1, r0
-	adds r1, 0xB
-	lsls r1, 24
-	lsrs r6, r1, 24
-	adds r0, r7, 0
-	movs r1, 0x3
-	bl __umodsi3
-	lsls r0, 1
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	ldr r1, _080708F4 @ =gUnknown_08376D04
-	lsls r0, r7, 2
-	adds r0, r1
-	ldr r0, [r0]
-	adds r1, r6, 0x1
-	lsls r1, 27
-	lsrs r1, 24
-	mov r2, r9
-	lsls r5, r2, 3
-	adds r2, r5, 0
-	movs r3, 0x1
-	bl MenuPrint_PixelCoords
-	mov r8, r4
-	cmp r7, 0x2
-	bne _080708FC
-	adds r4, r6, 0x6
-	lsls r1, r4, 3
-	adds r1, 0x6
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r0, _080708F8 @ =gOtherText_TallPlusAndRightArrow
-	adds r2, r5, 0
-	movs r3, 0
-	bl MenuPrint_PixelCoords
-	b _08070910
-	.align 2, 0
-_080708E4: .4byte gStringVar1
-_080708E8: .4byte 0x0201c000
-_080708EC: .4byte gUnknown_08376D1C
-_080708F0: .4byte 0x0201b264
-_080708F4: .4byte gUnknown_08376D04
-_080708F8: .4byte gOtherText_TallPlusAndRightArrow
-_080708FC:
-	adds r4, r6, 0x6
-	lsls r1, r4, 3
-	adds r1, 0x6
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r0, _08070960 @ =gOtherText_TallPlusAndRightArrow
-	adds r2, r5, 0
-	movs r3, 0x1
-	bl MenuPrint_PixelCoords
-_08070910:
-	movs r0, 0xFC
-	mov r1, r10
-	strb r0, [r1]
-	movs r0, 0x14
-	strb r0, [r1, 0x1]
-	movs r0, 0x6
-	strb r0, [r1, 0x2]
-	ldr r0, _08070964 @ =0x0201b264
-	add r0, r8
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	mov r0, r10
-	adds r0, 0x3
-	movs r2, 0x1
-	movs r3, 0x2
-	bl ConvertIntToDecimalStringN
-	lsls r1, r4, 27
-	movs r0, 0xC0
-	lsls r0, 20
-	adds r1, r0
-	lsrs r1, 24
-	mov r0, r9
-	lsls r2, r0, 3
-	mov r0, r10
-	movs r3, 0
-	bl MenuPrint_PixelCoords
-	adds r0, r7, 0x1
-	lsls r0, 24
-	lsrs r7, r0, 24
-	cmp r7, 0x5
-	bls _08070864
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08070960: .4byte gOtherText_TallPlusAndRightArrow
-_08070964: .4byte 0x0201b264
-	thumb_func_end sub_8070848
+    .section .text_8070968
 
 	thumb_func_start sub_8070968
 sub_8070968: @ 8070968