Merge pull request #100 from SethBarberee/save_workHEADmaster

Save work

1 files changed, 0 insertions, 262 deletions

diff --git a/asm/friend_area_action_menu.s b/asm/friend_area_action_menu.s
index 75d3dd2..0defc5d 100644
--- a/asm/friend_area_action_menu.s
+++ b/asm/friend_area_action_menu.s
@@ -472,266 +472,4 @@ _080277F4: .4byte gUnknown_80D4920
 _080277F8: .4byte gUnknown_80D4928
 	thumb_func_end sub_8027794
 
-	thumb_func_start sub_80277FC
-sub_80277FC:
-	push {r4,lr}
-	movs r0, 0x1
-	bl sub_8023A94
-	cmp r0, 0x4
-	bhi _080278AE
-	lsls r0, 2
-	ldr r1, _08027814
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08027814: .4byte _08027818
-	.align 2, 0
-_08027818:
-	.4byte _080278AE
-	.4byte _080278AE
-	.4byte _080278A4
-	.4byte _0802782C
-	.4byte _08027868
-_0802782C:
-	bl sub_8023B44
-	ldr r4, _08027860
-	ldr r1, [r4]
-	strh r0, [r1, 0x8]
-	ldr r3, _08027864
-	movs r0, 0x8
-	ldrsh r2, [r1, r0]
-	movs r0, 0x58
-	muls r2, r0
-	ldr r0, [r3]
-	adds r0, r2
-	str r0, [r1, 0x18]
-	ldrb r0, [r0, 0x2]
-	strb r0, [r1, 0x1C]
-	ldr r1, [r4]
-	movs r2, 0x8
-	ldrsh r0, [r1, r2]
-	adds r1, 0x14
-	bl PeekPokemonItem
-	movs r0, 0x3
-	bl SetFriendAreaActionMenuState
-	b _080278AE
-	.align 2, 0
-_08027860: .4byte gUnknown_203B2BC
-_08027864: .4byte gRecruitedPokemonRef
-_08027868:
-	bl sub_8023B44
-	ldr r4, _0802789C
-	ldr r1, [r4]
-	strh r0, [r1, 0x8]
-	ldr r3, _080278A0
-	movs r0, 0x8
-	ldrsh r2, [r1, r0]
-	movs r0, 0x58
-	muls r2, r0
-	ldr r0, [r3]
-	adds r0, r2
-	str r0, [r1, 0x18]
-	ldrb r0, [r0, 0x2]
-	strb r0, [r1, 0x1C]
-	ldr r1, [r4]
-	movs r2, 0x8
-	ldrsh r0, [r1, r2]
-	adds r1, 0x14
-	bl PeekPokemonItem
-	movs r0, 0x4
-	bl SetFriendAreaActionMenuState
-	b _080278AE
-	.align 2, 0
-_0802789C: .4byte gUnknown_203B2BC
-_080278A0: .4byte gRecruitedPokemonRef
-_080278A4:
-	bl sub_8023C60
-	movs r0, 0x11
-	bl SetFriendAreaActionMenuState
-_080278AE:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80277FC
-
-	thumb_func_start sub_80278B4
-sub_80278B4:
-	push {r4,lr}
-	sub sp, 0x4
-	movs r0, 0
-	str r0, [sp]
-	bl sub_8023A94
-	ldr r4, _080278F8
-	ldr r0, [r4]
-	adds r0, 0x7C
-	bl sub_8012FD8
-	lsls r0, 24
-	cmp r0, 0
-	bne _080278E4
-	ldr r0, [r4]
-	adds r0, 0x7C
-	mov r1, sp
-	bl sub_8013114
-	ldr r1, [sp]
-	cmp r1, 0x1
-	beq _080278E4
-	ldr r0, [r4]
-	str r1, [r0, 0x70]
-_080278E4:
-	ldr r0, [sp]
-	subs r0, 0x1
-	cmp r0, 0xB
-	bls _080278EE
-	b _08027A36
-_080278EE:
-	lsls r0, 2
-	ldr r1, _080278FC
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_080278F8: .4byte gUnknown_203B2BC
-_080278FC: .4byte _08027900
-	.align 2, 0
-_08027900:
-	.4byte _08027A30
-	.4byte _08027A36
-	.4byte _08027A36
-	.4byte _08027A20
-	.4byte _08027A28
-	.4byte _08027930
-	.4byte _0802796C
-	.4byte _0802798C
-	.4byte _080279C0
-	.4byte _080279D0
-	.4byte _080279D8
-	.4byte _080279C8
-_08027930:
-	ldr r4, _08027964
-	ldr r0, [r4]
-	movs r1, 0x8
-	ldrsh r0, [r0, r1]
-	bl sub_808D750
-	lsls r0, 24
-	cmp r0, 0
-	beq _0802795E
-	ldr r0, [r4]
-	movs r2, 0x8
-	ldrsh r1, [r0, r2]
-	movs r0, 0x58
-	muls r1, r0
-	ldr r0, _08027968
-	ldr r0, [r0]
-	adds r1, r0
-	ldrh r2, [r1]
-	movs r0, 0x2
-	orrs r0, r2
-	strh r0, [r1]
-	bl nullsub_104
-_0802795E:
-	bl sub_808ED00
-	b _08027A0E
-	.align 2, 0
-_08027964: .4byte gUnknown_203B2BC
-_08027968: .4byte gRecruitedPokemonRef
-_0802796C:
-	ldr r0, _08027984
-	ldr r0, [r0]
-	ldr r2, [r0, 0x18]
-	ldrh r1, [r2]
-	ldr r0, _08027988
-	ands r0, r1
-	strh r0, [r2]
-	bl nullsub_104
-	bl sub_808ED00
-	b _08027A0E
-	.align 2, 0
-_08027984: .4byte gUnknown_203B2BC
-_08027988: .4byte 0x0000fffd
-_0802798C:
-	ldr r2, _080279B8
-	ldr r0, _080279BC
-	ldr r0, [r0]
-	movs r3, 0x8
-	ldrsh r1, [r0, r3]
-	movs r0, 0x58
-	muls r1, r0
-	ldr r0, [r2]
-	adds r4, r0, r1
-	bl GetPlayerPokemonStruct
-	ldrb r1, [r4, 0x2]
-	cmp r1, 0
-	bne _080279B2
-	strb r1, [r0, 0x2]
-	movs r0, 0x1
-	strb r0, [r4, 0x2]
-	bl nullsub_104
-_080279B2:
-	bl sub_808ED00
-	b _08027A0E
-	.align 2, 0
-_080279B8: .4byte gRecruitedPokemonRef
-_080279BC: .4byte gUnknown_203B2BC
-_080279C0:
-	movs r0, 0x8
-	bl SetFriendAreaActionMenuState
-	b _08027A36
-_080279C8:
-	movs r0, 0xE
-	bl SetFriendAreaActionMenuState
-	b _08027A36
-_080279D0:
-	movs r0, 0xA
-	bl SetFriendAreaActionMenuState
-	b _08027A36
-_080279D8:
-	ldr r0, _08027A18
-	bl PlaySound
-	ldr r4, _08027A1C
-	ldr r1, [r4]
-	ldrb r0, [r1, 0x14]
-	cmp r0, 0
-	beq _080279F0
-	adds r0, r1, 0
-	adds r0, 0x14
-	bl sub_8091274
-_080279F0:
-	bl FillInventoryGaps
-	ldr r0, [r4]
-	movs r1, 0
-	strb r1, [r0, 0x14]
-	ldr r0, [r4]
-	strb r1, [r0, 0x15]
-	ldr r1, [r4]
-	movs r2, 0x8
-	ldrsh r0, [r1, r2]
-	adds r1, 0x14
-	bl GivePokemonItem
-	bl nullsub_104
-_08027A0E:
-	movs r0, 0x2
-	bl SetFriendAreaActionMenuState
-	b _08027A36
-	.align 2, 0
-_08027A18: .4byte 0x0000014d
-_08027A1C: .4byte gUnknown_203B2BC
-_08027A20:
-	movs r0, 0x4
-	bl SetFriendAreaActionMenuState
-	b _08027A36
-_08027A28:
-	movs r0, 0x5
-	bl SetFriendAreaActionMenuState
-	b _08027A36
-_08027A30:
-	movs r0, 0x2
-	bl SetFriendAreaActionMenuState
-_08027A36:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80278B4
-
         .align 2,0