through sub_811164C

2018-10-11 16:21:47 -04:00
parent 3310b1445a
commit feadfc8911
2 changed files with 40 additions and 93 deletions
@@ -5,97 +5,6 @@

 	.text

-	thumb_func_start sub_81115E8
-sub_81115E8: @ 81115E8
-	push {r4,lr}
-	bl sub_8111618
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	bl sub_811164C
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	ldr r0, _08111614 @ =0x00004027
-	lsls r4, 12
-	adds r1, r4
-	lsls r1, 16
-	lsrs r1, 16
-	bl VarSet
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08111614: .4byte 0x00004027
-	thumb_func_end sub_81115E8
-
-	thumb_func_start sub_8111618
-sub_8111618: @ 8111618
-	push {r4,r5,lr}
-	movs r5, 0
-	movs r4, 0
-_0811161E:
-	movs r0, 0x64
-	muls r0, r4
-	ldr r1, _08111648 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x5
-	bl GetMonData
-	cmp r0, 0
-	beq _08111636
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-_08111636:
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0x5
-	bls _0811161E
-	adds r0, r5, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08111648: .4byte gPlayerParty
-	thumb_func_end sub_8111618
-
-	thumb_func_start sub_811164C
-sub_811164C: @ 811164C
-	push {r4-r7,lr}
-	movs r6, 0
-	movs r0, 0
-_08111652:
-	movs r4, 0
-	lsls r5, r0, 24
-	adds r7, r0, 0x1
-_08111658:
-	lsls r1, r4, 24
-	lsrs r1, 24
-	lsrs r0, r5, 24
-	movs r2, 0x5
-	bl GetBoxMonDataFromAnyBox
-	cmp r0, 0
-	beq _0811166E
-	adds r0, r6, 0x1
-	lsls r0, 16
-	lsrs r6, r0, 16
-_0811166E:
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0x1D
-	bls _08111658
-	lsls r0, r7, 16
-	lsrs r0, 16
-	cmp r0, 0xD
-	bls _08111652
-	adds r0, r6, 0
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_811164C
-
 	thumb_func_start sub_8111688
 sub_8111688: @ 8111688
 	push {r4-r7,lr}