start working on daycare

1 files changed, 14 insertions, 1242 deletions

diff --git a/asm/daycare.s b/asm/daycare.s
index 065911df8..cf2d6e3e8 100644
--- a/asm/daycare.s
+++ b/asm/daycare.s
@@ -5,1239 +5,11 @@
 
 	.text
 
-	thumb_func_start GetMonNick
-GetMonNick: @ 806FA2C
-	push {r4,lr}
-	sub sp, 0x14
-	adds r4, r1, 0
-	movs r1, 0x2
-	mov r2, sp
-	bl GetMonData
-	adds r0, r4, 0
-	mov r1, sp
-	bl StringCopy10
-	add sp, 0x14
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end GetMonNick
-
-	thumb_func_start GetBoxMonNick
-GetBoxMonNick: @ 806FA4C
-	push {r4,lr}
-	sub sp, 0x14
-	adds r4, r1, 0
-	movs r1, 0x2
-	mov r2, sp
-	bl GetBoxMonData
-	adds r0, r4, 0
-	mov r1, sp
-	bl StringCopy10
-	add sp, 0x14
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end GetBoxMonNick
-
-	thumb_func_start daycare_count_pokemon
-daycare_count_pokemon: @ 806FA6C
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	movs r5, 0
-	movs r4, 0
-_0806FA74:
-	movs r0, 0x8C
-	muls r0, r4
-	adds r0, r6, r0
-	movs r1, 0xB
-	bl GetBoxMonData
-	cmp r0, 0
-	beq _0806FA8A
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-_0806FA8A:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x1
-	bls _0806FA74
-	adds r0, r5, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end daycare_count_pokemon
-
-	thumb_func_start sub_806FA9C
-sub_806FA9C: @ 806FA9C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	mov r9, r0
-	mov r10, r1
-	movs r7, 0
-	movs r5, 0
-	mov r6, r10
-	adds r6, 0x74
-	movs r0, 0x1
-	mov r8, r0
-_0806FAB6:
-	movs r0, 0x8C
-	muls r0, r5
-	mov r1, r9
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0xB
-	bl GetBoxMonData
-	cmp r0, 0
-	beq _0806FAE4
-	adds r0, r7, 0x1
-	lsls r0, 24
-	lsrs r7, r0, 24
-	adds r0, r4, 0
-	movs r1, 0xC
-	bl GetBoxMonData
-	adds r1, r0, 0
-	cmp r1, 0
-	bne _0806FAE4
-	lsls r0, r5, 1
-	adds r0, r6, r0
-	b _0806FAEA
-_0806FAE4:
-	lsls r0, r5, 1
-	adds r0, r6, r0
-	mov r1, r8
-_0806FAEA:
-	strh r1, [r0]
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x1
-	bls _0806FAB6
-	mov r0, r10
-	str r7, [r0, 0x70]
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_806FA9C
-
-	thumb_func_start daycare_empty_slot
-@ u8 daycare_empty_slot(struct daycare_mon *dayCareMons)
-daycare_empty_slot: @ 806FB08
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	movs r4, 0
-_0806FB0E:
-	movs r0, 0x8C
-	muls r0, r4
-	adds r0, r5, r0
-	movs r1, 0xB
-	bl GetBoxMonData
-	cmp r0, 0
-	bne _0806FB24
-	lsls r0, r4, 24
-	asrs r0, 24
-	b _0806FB32
-_0806FB24:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x1
-	bls _0806FB0E
-	movs r0, 0x1
-	negs r0, r0
-_0806FB32:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end daycare_empty_slot
-
-	thumb_func_start sub_806FB38
-@ void sub_806FB38(struct pokemon *mon, struct daycare_mon *dayCareMon)
-sub_806FB38: @ 806FB38
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	adds r5, r1, 0
-	bl sub_80D43F0
-	lsls r0, 24
-	cmp r0, 0
-	beq _0806FBBC
-	adds r0, r5, 0
-	adds r0, 0x74
-	ldr r1, =gSaveBlock2Ptr
-	ldr r1, [r1]
-	bl StringCopy
-	adds r4, r5, 0
-	adds r4, 0x7C
-	adds r0, r6, 0
-	adds r1, r4, 0
-	bl GetMonNick
-	adds r0, r4, 0
-	bl StripExtCtrlCodes
-	adds r4, 0xB
-	ldrb r1, [r4]
-	movs r0, 0x10
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r4]
-	adds r0, r6, 0
-	movs r1, 0x3
-	bl GetMonData
-	lsls r0, 4
-	ldrb r2, [r4]
-	movs r1, 0xF
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r4]
-	adds r0, r6, 0
-	movs r1, 0x40
-	bl GetMonData
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gSaveBlock1Ptr
-	ldr r1, [r1]
-	lsls r2, r0, 3
-	adds r2, r0
-	lsls r2, 2
-	adds r1, r2
-	adds r0, r5, 0
-	adds r0, 0x50
-	ldr r2, =0x00002be0
-	adds r1, r2
-	ldm r1!, {r2-r4}
-	stm r0!, {r2-r4}
-	ldm r1!, {r2-r4}
-	stm r0!, {r2-r4}
-	ldm r1!, {r2-r4}
-	stm r0!, {r2-r4}
-	adds r0, r6, 0
-	bl sub_80D4680
-_0806FBBC:
-	adds r0, r5, 0
-	adds r1, r6, 0
-	movs r2, 0x50
-	bl memcpy
-	adds r0, r5, 0
-	bl BoxMonRestorePP
-	adds r1, r5, 0
-	adds r1, 0x88
-	movs r0, 0
-	str r0, [r1]
-	adds r0, r6, 0
-	bl ZeroMonData
-	bl party_compaction
-	bl CalculatePlayerPartyCount
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_806FB38
-
-	thumb_func_start daycare_send
-@ void daycare_send(struct pokemon *mon, struct daycare_mon *dayCareMons)
-daycare_send: @ 806FBF4
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	adds r0, r4, 0
-	bl daycare_empty_slot
-	lsls r0, 24
-	asrs r0, 24
-	movs r1, 0x8C
-	muls r0, r1
-	adds r4, r0
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl sub_806FB38
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end daycare_send
-
-	thumb_func_start daycare_send_selected_pokemon
-daycare_send_selected_pokemon: @ 806FC18
-	push {lr}
-	bl brm_get_pokemon_selection
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x64
-	muls r0, r1
-	ldr r1, =gPlayerParty
-	adds r0, r1
-	ldr r1, =gSaveBlock1Ptr
-	ldr r1, [r1]
-	ldr r2, =0x00003030
-	adds r1, r2
-	bl daycare_send
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end daycare_send_selected_pokemon
-
-	thumb_func_start sub_806FC48
-sub_806FC48: @ 806FC48
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	adds r4, r5, 0
-	adds r4, 0x8C
-	adds r0, r4, 0
-	movs r1, 0xB
-	bl GetBoxMonData
-	cmp r0, 0
-	beq _0806FC9E
-	adds r0, r5, 0
-	movs r1, 0xB
-	bl GetBoxMonData
-	adds r6, r0, 0
-	cmp r6, 0
-	bne _0806FC9E
-	adds r0, r5, 0
-	adds r1, r4, 0
-	movs r2, 0x50
-	bl memcpy
-	adds r0, r4, 0
-	bl ZeroBoxMonData
-	adds r4, 0x50
-	adds r0, r5, 0
-	adds r0, 0x50
-	adds r1, r4, 0
-	movs r2, 0x38
-	bl memcpy
-	adds r2, r5, 0
-	adds r2, 0x88
-	movs r0, 0x8A
-	lsls r0, 1
-	adds r1, r5, r0
-	ldr r0, [r1]
-	str r0, [r2]
-	str r6, [r1]
-	adds r0, r4, 0
-	bl sub_806FF80
-_0806FC9E:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_806FC48
-
-	thumb_func_start sub_806FCA4
-sub_806FCA4: @ 806FCA4
-	push {r4-r7,lr}
-	adds r4, r0, 0
-	movs r5, 0
-	ldr r7, =0x0000ffff
-_0806FCAC:
-	adds r0, r4, 0
-	bl TryIncrementMonLevel
-	lsls r0, 24
-	cmp r0, 0
-	beq _0806FCE8
-	movs r6, 0x1
-	adds r5, 0x1
-	b _0806FCD4
-	.pool
-_0806FCC4:
-	movs r6, 0
-	cmp r0, r7
-	bne _0806FCD4
-	ldr r0, =gMoveToLearn
-	ldrh r1, [r0]
-	adds r0, r4, 0
-	bl DeleteFirstMoveAndGiveMoveToMon
-_0806FCD4:
-	adds r0, r4, 0
-	adds r1, r6, 0
-	bl MonTryLearningNewMove
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0
-	bne _0806FCC4
-	cmp r5, 0x63
-	ble _0806FCAC
-_0806FCE8:
-	adds r0, r4, 0
-	bl CalculateMonStats
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_806FCA4
-
-	thumb_func_start sub_806FCF8
-sub_806FCF8: @ 806FCF8
-	push {r4-r7,lr}
-	sub sp, 0x68
-	adds r5, r0, 0
-	ldr r1, =gStringVar1
-	bl GetBoxMonNick
-	adds r0, r5, 0
-	movs r1, 0xB
-	bl GetBoxMonData
-	lsls r0, 16
-	lsrs r7, r0, 16
-	adds r0, r5, 0
-	mov r1, sp
-	bl sub_8069004
-	mov r0, sp
-	movs r1, 0x38
-	bl GetMonData
-	cmp r0, 0x64
-	beq _0806FD46
-	mov r0, sp
-	movs r1, 0x19
-	bl GetMonData
-	adds r1, r5, 0
-	adds r1, 0x88
-	ldr r1, [r1]
-	adds r0, r1
-	str r0, [sp, 0x64]
-	add r2, sp, 0x64
-	mov r0, sp
-	movs r1, 0x19
-	bl SetMonData
-	mov r0, sp
-	bl sub_806FCA4
-_0806FD46:
-	ldr r0, =gPlayerParty
-	movs r1, 0xFA
-	lsls r1, 1
-	adds r6, r0, r1
-	adds r0, r6, 0
-	mov r1, sp
-	movs r2, 0x64
-	bl memcpy
-	adds r0, r5, 0
-	adds r0, 0x70
-	ldrh r0, [r0]
-	cmp r0, 0
-	beq _0806FD74
-	adds r4, r5, 0
-	adds r4, 0x50
-	adds r0, r6, 0
-	adds r1, r4, 0
-	bl sub_80D460C
-	adds r0, r4, 0
-	bl sub_806FF80
-_0806FD74:
-	adds r0, r5, 0
-	bl ZeroBoxMonData
-	adds r1, r5, 0
-	adds r1, 0x88
-	movs r0, 0
-	str r0, [r1]
-	bl party_compaction
-	bl CalculatePlayerPartyCount
-	adds r0, r7, 0
-	add sp, 0x68
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_806FCF8
-
-	thumb_func_start sub_806FD9C
-sub_806FD9C: @ 806FD9C
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	movs r0, 0x8C
-	muls r0, r1
-	adds r0, r5, r0
-	bl sub_806FCF8
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	adds r0, r5, 0
-	bl sub_806FC48
-	adds r0, r4, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_806FD9C
-
-	thumb_func_start sub_806FDC4
-sub_806FDC4: @ 806FDC4
-	push {lr}
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00003030
-	adds r0, r1
-	ldr r1, =gSpecialVar_0x8004
-	ldrb r1, [r1]
-	bl sub_806FD9C
-	lsls r0, 16
-	lsrs r0, 16
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_806FDC4
-
-	thumb_func_start sub_806FDEC
-sub_806FDEC: @ 806FDEC
-	push {r4,r5,lr}
-	sub sp, 0x54
-	adds r4, r0, 0
-	adds r5, r1, 0
-	mov r0, sp
-	adds r1, r4, 0
-	movs r2, 0x50
-	bl memcpy
-	adds r0, r4, 0
-	movs r1, 0x19
-	bl GetBoxMonData
-	adds r0, r5
-	str r0, [sp, 0x50]
-	add r2, sp, 0x50
-	mov r0, sp
-	movs r1, 0x19
-	bl SetBoxMonData
-	mov r0, sp
-	bl GetLevelFromBoxMonExp
-	lsls r0, 24
-	lsrs r0, 24
-	add sp, 0x54
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_806FDEC
-
-	thumb_func_start sub_806FE28
-sub_806FE28: @ 806FE28
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	bl GetLevelFromBoxMonExp
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	adds r0, 0x88
-	ldr r1, [r0]
-	adds r0, r5, 0
-	bl sub_806FDEC
-	lsls r0, 24
-	lsrs r0, 24
-	subs r0, r4
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_806FE28
-
-	thumb_func_start sub_806FE54
-sub_806FE54: @ 806FE54
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	bl sub_806FE28
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r0, =gStringVar2
-	adds r1, r4, 0
-	movs r2, 0
-	movs r3, 0x2
-	bl ConvertIntToDecimalStringN
-	ldr r1, =gStringVar1
-	adds r0, r5, 0
-	bl GetBoxMonNick
-	adds r0, r4, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_806FE54
-
-	thumb_func_start sub_806FE88
-sub_806FE88: @ 806FE88
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	bl sub_806FE28
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r1, =gStringVar1
-	adds r0, r5, 0
-	bl GetBoxMonNick
-	movs r0, 0x64
-	muls r4, r0
-	adds r4, 0x64
-	ldr r0, =gStringVar2
-	adds r1, r4, 0
-	movs r2, 0
-	movs r3, 0x5
-	bl ConvertIntToDecimalStringN
-	adds r0, r4, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_806FE88
-
-	thumb_func_start sub_806FEC0
-sub_806FEC0: @ 806FEC0
-	push {lr}
-	lsls r1, 24
-	lsrs r1, 24
-	movs r2, 0x8C
-	muls r1, r2
-	adds r0, r1
-	bl sub_806FE88
-	lsls r0, 16
-	lsrs r0, 16
-	pop {r1}
-	bx r1
-	thumb_func_end sub_806FEC0
-
-	thumb_func_start sub_806FED8
-sub_806FED8: @ 806FED8
-	push {lr}
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00003030
-	adds r0, r1
-	ldr r1, =gSpecialVar_0x8004
-	ldrb r1, [r1]
-	bl sub_806FEC0
-	ldr r1, =gSpecialVar_0x8005
-	strh r0, [r1]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_806FED8
-
-	thumb_func_start sub_806FF04
-sub_806FF04: @ 806FF04
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r1, =gSaveBlock1Ptr
-	ldr r2, [r1]
-	ldr r1, =0x000030b8
-	adds r3, r2, r1
-	ldr r1, [r3]
-	adds r1, r0
-	str r1, [r3]
-	ldr r1, =0x00003144
-	adds r2, r1
-	ldr r1, [r2]
-	adds r1, r0
-	str r1, [r2]
-	bx lr
-	.pool
-	thumb_func_end sub_806FF04
-
-	thumb_func_start sub_806FF30
-sub_806FF30: @ 806FF30
-	push {r4-r6,lr}
-	ldr r6, =gSaveBlock1Ptr
-	ldr r5, =gSpecialVar_0x8004
-	ldrh r0, [r5]
-	movs r4, 0x8C
-	adds r1, r0, 0
-	muls r1, r4
-	ldr r0, =0x00003030
-	adds r1, r0
-	ldr r0, [r6]
-	adds r0, r1
-	movs r1, 0xB
-	bl GetBoxMonData
-	cmp r0, 0
-	bne _0806FF60
-	movs r0, 0
-	b _0806FF76
-	.pool
-_0806FF60:
-	ldrh r0, [r5]
-	adds r1, r0, 0
-	muls r1, r4
-	ldr r0, =0x00003030
-	adds r1, r0
-	ldr r0, [r6]
-	adds r0, r1
-	bl sub_806FE54
-	lsls r0, 24
-	lsrs r0, 24
-_0806FF76:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_806FF30
-
-	thumb_func_start sub_806FF80
-sub_806FF80: @ 806FF80
-	push {lr}
-	movs r3, 0
-	movs r2, 0x7
-	adds r1, r0, 0
-	adds r1, 0x2B
-_0806FF8A:
-	strb r3, [r1]
-	subs r1, 0x1
-	subs r2, 0x1
-	cmp r2, 0
-	bge _0806FF8A
-	adds r2, r0, 0
-	adds r2, 0x2C
-	movs r3, 0
-	adds r1, r0, 0
-	adds r1, 0x36
-_0806FF9E:
-	strb r3, [r1]
-	subs r1, 0x1
-	cmp r1, r2
-	bge _0806FF9E
-	bl sub_80D439C
-	pop {r0}
-	bx r0
-	thumb_func_end sub_806FF80
-
-	thumb_func_start sub_806FFB0
-sub_806FFB0: @ 806FFB0
-	push {r4,lr}
-	adds r4, r0, 0
-	bl ZeroBoxMonData
-	adds r1, r4, 0
-	adds r1, 0x88
-	movs r0, 0
-	str r0, [r1]
-	adds r4, 0x50
-	adds r0, r4, 0
-	bl sub_806FF80
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_806FFB0
-
-	thumb_func_start sub_806FFD0
-sub_806FFD0: @ 806FFD0
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	movs r4, 0
-	movs r6, 0x8C
-_0806FFD8:
-	adds r0, r4, 0
-	muls r0, r6
-	adds r0, r5, r0
-	bl sub_806FFB0
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x1
-	bls _0806FFD8
-	movs r1, 0x8C
-	lsls r1, 1
-	adds r0, r5, r1
-	movs r1, 0
-	str r1, [r0]
-	movs r2, 0x8E
-	lsls r2, 1
-	adds r0, r5, r2
-	strb r1, [r0]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_806FFD0
-
-	thumb_func_start sub_8070004
-sub_8070004: @ 8070004
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 16
-	lsrs r2, r0, 16
-	movs r0, 0
-	mov r8, r0
-	ldr r0, =gEvolutionTable
-	mov r12, r0
-_08070016:
-	movs r7, 0
-	movs r6, 0x1
-	movs r4, 0x80
-	lsls r4, 9
-	movs r5, 0x28
-	mov r3, r12
-	adds r3, 0x28
-_08070024:
-	movs r1, 0
-	ldrh r0, [r3, 0x4]
-	cmp r0, r2
-	bne _08070034
-	lsrs r2, r4, 16
-	b _08070060
-	.pool
-_08070034:
-	adds r1, 0x1
-	cmp r1, 0x4
-	bgt _0807004A
-	lsls r0, r1, 3
-	adds r0, r5
-	add r0, r12
-	ldrh r0, [r0, 0x4]
-	cmp r0, r2
-	bne _08070034
-	lsrs r2, r4, 16
-	movs r7, 0x1
-_0807004A:
-	cmp r7, 0
-	bne _08070060
-	movs r0, 0x80
-	lsls r0, 9
-	adds r4, r0
-	adds r5, 0x28
-	adds r3, 0x28
-	adds r6, 0x1
-	ldr r0, =0x0000019b
-	cmp r6, r0
-	ble _08070024
-_08070060:
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r6, r0
-	beq _08070072
-	movs r0, 0x1
-	add r8, r0
-	mov r0, r8
-	cmp r0, 0x4
-	ble _08070016
-_08070072:
-	adds r0, r2, 0
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8070004
 
-	thumb_func_start sub_8070084
-sub_8070084: @ 8070084
-	push {r4-r7,lr}
-	sub sp, 0x8
-	adds r6, r0, 0
-	movs r7, 0x1
-	negs r7, r7
-	movs r4, 0
-_08070090:
-	movs r0, 0x8C
-	muls r0, r4
-	adds r0, r6, r0
-	bl GetBoxMonGender
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xFE
-	bne _080700A4
-	adds r7, r4, 0
-_080700A4:
-	adds r4, 0x1
-	cmp r4, 0x1
-	ble _08070090
-	movs r5, 0
-	movs r4, 0
-_080700AE:
-	movs r0, 0x8C
-	muls r0, r4
-	adds r0, r6, r0
-	movs r1, 0xB
-	bl GetBoxMonData
-	lsls r1, r4, 2
-	add r1, sp
-	str r0, [r1]
-	cmp r0, 0x84
-	bne _080700C8
-	adds r5, 0x1
-	adds r7, r4, 0
-_080700C8:
-	adds r4, 0x1
-	cmp r4, 0x1
-	ble _080700AE
-	cmp r5, 0x2
-	bne _080700E2
-	bl Random
-	lsls r0, 16
-	ldr r1, =0x7ffe0000
-	movs r7, 0x1
-	cmp r0, r1
-	bls _080700E2
-	movs r7, 0
-_080700E2:
-	movs r0, 0x8C
-	muls r0, r7
-	adds r0, r6, r0
-	movs r1, 0xC
-	bl GetBoxMonData
-	cmp r0, 0xC3
-	bne _080700FE
-	bl Random
-	lsls r0, 16
-	ldr r1, =0x7ffe0000
-	cmp r0, r1
-	bls _08070108
-_080700FE:
-	movs r0, 0x1
-	negs r0, r0
-	b _0807010A
-	.pool
-_08070108:
-	adds r0, r7, 0
-_0807010A:
-	add sp, 0x8
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8070084
 
-	thumb_func_start sub_8070114
-sub_8070114: @ 8070114
-	push {r4-r7,lr}
-	adds r5, r0, 0
-	movs r6, 0
-	ldr r0, =gMain
-	ldrh r0, [r0, 0x24]
-	bl SeedRng2
-	adds r0, r5, 0
-	bl sub_8070084
-	adds r1, r0, 0
-	cmp r1, 0
-	bge _08070160
-	bl Random2
-	adds r4, r0, 0
-	bl Random
-	movs r1, 0x8C
-	lsls r1, 1
-	adds r5, r1
-	lsls r4, 16
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r1, =0x0000fffe
-	bl __umodsi3
-	lsls r0, 16
-	lsrs r0, 16
-	adds r0, 0x1
-	orrs r4, r0
-	str r4, [r5]
-	b _080701AC
-	.pool
-_08070160:
-	movs r0, 0x8C
-	muls r0, r1
-	adds r0, r5, r0
-	movs r1, 0
-	movs r2, 0
-	bl GetBoxMonData
-	bl GetNatureFromPersonality
-	lsls r0, 24
-	lsrs r7, r0, 24
-_08070176:
-	bl Random2
-	adds r4, r0, 0
-	bl Random
-	lsls r4, 16
-	lsls r0, 16
-	lsrs r0, 16
-	orrs r4, r0
-	adds r0, r4, 0
-	bl GetNatureFromPersonality
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r7, r0
-	bne _0807019A
-	cmp r4, 0
-	bne _080701A4
-_0807019A:
-	adds r6, 0x1
-	movs r0, 0x96
-	lsls r0, 4
-	cmp r6, r0
-	ble _08070176
-_080701A4:
-	movs r1, 0x8C
-	lsls r1, 1
-	adds r0, r5, r1
-	str r4, [r0]
-_080701AC:
-	movs r0, 0x86
-	bl FlagSet
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8070114
-
-	thumb_func_start sub_80701B8
-sub_80701B8: @ 80701B8
-	push {r4,lr}
-	adds r4, r0, 0
-	bl Random
-	movs r1, 0x8C
-	lsls r1, 1
-	adds r4, r1
-	movs r2, 0x80
-	lsls r2, 8
-	adds r1, r2, 0
-	orrs r0, r1
-	lsls r0, 16
-	lsrs r0, 16
-	str r0, [r4]
-	movs r0, 0x86
-	bl FlagSet
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80701B8
-
-	thumb_func_start sub_80701E0
-sub_80701E0: @ 80701E0
-	push {lr}
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00003030
-	adds r0, r1
-	bl sub_8070114
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80701E0
-
-	thumb_func_start sub_80701FC
-sub_80701FC: @ 80701FC
-	push {lr}
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00003030
-	adds r0, r1
-	bl sub_80701B8
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80701FC
-
-	thumb_func_start sub_8070218
-sub_8070218: @ 8070218
-	push {r4,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r1, r4, r1
-	movs r0, 0xFF
-	strb r0, [r1]
-	movs r2, 0
-_0807022A:
-	mov r1, sp
-	adds r0, r1, r2
-	adds r1, r4, r2
-	ldrb r1, [r1]
-	strb r1, [r0]
-	adds r2, 0x1
-	cmp r2, 0x5
-	ble _0807022A
-	movs r3, 0
-	movs r2, 0
-_0807023E:
-	mov r1, sp
-	adds r0, r1, r2
-	ldrb r1, [r0]
-	adds r0, r1, 0
-	cmp r0, 0xFF
-	beq _08070250
-	adds r0, r4, r3
-	strb r1, [r0]
-	adds r3, 0x1
-_08070250:
-	adds r2, 0x1
-	cmp r2, 0x5
-	ble _0807023E
-	add sp, 0x8
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8070218
-
-	thumb_func_start sub_8070260
-sub_8070260: @ 8070260
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x14
-	mov r9, r0
-	mov r8, r1
-	movs r5, 0
-	add r1, sp, 0x4
-	add r7, sp, 0xC
-	adds r2, r1, 0
-_08070276:
-	adds r0, r2, r5
-	strb r5, [r0]
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x5
-	bls _08070276
-	movs r5, 0
-	adds r6, r1, 0
-_08070288:
-	bl Random
-	mov r1, sp
-	adds r4, r1, r5
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x6
-	subs r1, r5
-	bl __modsi3
-	adds r0, r6, r0
-	ldrb r0, [r0]
-	strb r0, [r4]
-	adds r0, r6, 0
-	adds r1, r5, 0
-	bl sub_8070218
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x2
-	bls _08070288
-	movs r5, 0
-	movs r4, 0x1
-_080702B8:
-	bl Random
-	adds r1, r7, r5
-	lsls r0, 16
-	lsrs r0, 16
-	ands r0, r4
-	strb r0, [r1]
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x2
-	bls _080702B8
-	movs r5, 0
-_080702D2:
-	mov r1, sp
-	adds r0, r1, r5
-	ldrb r0, [r0]
-	cmp r0, 0x5
-	bhi _080703AE
-	lsls r0, 2
-	ldr r1, =_080702EC
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_080702EC:
-	.4byte _08070304
-	.4byte _08070322
-	.4byte _0807033C
-	.4byte _08070356
-	.4byte _08070370
-	.4byte _08070390
-_08070304:
-	adds r0, r7, r5
-	ldrb r1, [r0]
-	movs r0, 0x8C
-	muls r0, r1
-	add r0, r8
-	movs r1, 0x27
-	bl GetBoxMonData
-	add r2, sp, 0x10
-	strb r0, [r2]
-	mov r0, r9
-	movs r1, 0x27
-	bl SetMonData
-	b _080703AE
-_08070322:
-	add r4, sp, 0x10
-	adds r0, r7, r5
-	ldrb r1, [r0]
-	movs r0, 0x8C
-	muls r0, r1
-	add r0, r8
-	movs r1, 0x28
-	bl GetBoxMonData
-	strb r0, [r4]
-	mov r0, r9
-	movs r1, 0x28
-	b _08070388
-_0807033C:
-	add r4, sp, 0x10
-	adds r0, r7, r5
-	ldrb r1, [r0]
-	movs r0, 0x8C
-	muls r0, r1
-	add r0, r8
-	movs r1, 0x29
-	bl GetBoxMonData
-	strb r0, [r4]
-	mov r0, r9
-	movs r1, 0x29
-	b _08070388
-_08070356:
-	add r4, sp, 0x10
-	adds r0, r7, r5
-	ldrb r1, [r0]
-	movs r0, 0x8C
-	muls r0, r1
-	add r0, r8
-	movs r1, 0x2A
-	bl GetBoxMonData
-	strb r0, [r4]
-	mov r0, r9
-	movs r1, 0x2A
-	b _08070388
-_08070370:
-	add r4, sp, 0x10
-	adds r0, r7, r5
-	ldrb r1, [r0]
-	movs r0, 0x8C
-	muls r0, r1
-	add r0, r8
-	movs r1, 0x2B
-	bl GetBoxMonData
-	strb r0, [r4]
-	mov r0, r9
-	movs r1, 0x2B
-_08070388:
-	adds r2, r4, 0
-	bl SetMonData
-	b _080703AE
-_08070390:
-	add r4, sp, 0x10
-	adds r0, r7, r5
-	ldrb r1, [r0]
-	movs r0, 0x8C
-	muls r0, r1
-	add r0, r8
-	movs r1, 0x2C
-	bl GetBoxMonData
-	strb r0, [r4]
-	mov r0, r9
-	movs r1, 0x2C
-	adds r2, r4, 0
-	bl SetMonData
-_080703AE:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x2
-	bls _080702D2
-	add sp, 0x14
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8070260
 
-	thumb_func_start pokemon_get_eggmoves
-pokemon_get_eggmoves: @ 80703C8
+	thumb_func_start GetEggMoves
+GetEggMoves: @ 80703C8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -1317,7 +89,7 @@ _08070456:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end pokemon_get_eggmoves
+	thumb_func_end GetEggMoves
 
 	thumb_func_start daycare_build_child_moveset
 daycare_build_child_moveset: @ 8070470
@@ -1410,7 +182,7 @@ _080704F2:
 	bls _080704F2
 	ldr r1, =gUnknown_02024A38
 	adds r0, r7, 0
-	bl pokemon_get_eggmoves
+	bl GetEggMoves
 	lsls r0, 24
 	lsrs r0, 24
 	mov r8, r0
@@ -1815,7 +587,7 @@ _0807083E:
 	lsls r0, 1
 	add r0, sp
 	ldrh r0, [r0]
-	bl sub_8070004
+	bl GetEggSpecies
 	lsls r0, 16
 	lsrs r4, r0, 16
 	cmp r4, 0x1D
@@ -1895,7 +667,7 @@ sub_80708C8: @ 80708C8
 	bl sub_8070A0C
 	mov r0, sp
 	adds r1, r6, 0
-	bl sub_8070260
+	bl InheritIVs
 	ldrb r0, [r5, 0x1]
 	movs r2, 0x8C
 	adds r1, r0, 0
@@ -1927,7 +699,7 @@ _08070918:
 	mov r1, sp
 	movs r2, 0x64
 	bl memcpy
-	bl party_compaction
+	bl CompactPartySlots
 	bl CalculatePlayerPartyCount
 	adds r0, r6, 0
 	bl sub_8070710
@@ -2163,7 +935,7 @@ _08070AEE:
 	bl __udivsi3
 	cmp r4, r0
 	bls _08070B34
-	bl sub_80701E0
+	bl TriggerPendingDaycareEgg
 _08070B34:
 	movs r0, 0x8E
 	lsls r0, 1
@@ -2309,7 +1081,7 @@ _08070C44:
 	thumb_func_start sub_8070C58
 sub_8070C58: @ 8070C58
 	push {r4,r5,lr}
-	bl brm_get_pokemon_selection
+	bl GetCursorSelectionMonId
 	lsls r0, 24
 	lsrs r0, 24
 	movs r5, 0x64
@@ -2318,7 +1090,7 @@ sub_8070C58: @ 8070C58
 	adds r0, r4
 	ldr r1, =gStringVar1
 	bl GetBoxMonNick
-	bl brm_get_pokemon_selection
+	bl GetCursorSelectionMonId
 	lsls r0, 24
 	lsrs r0, 24
 	muls r0, r5
@@ -2364,7 +1136,7 @@ _08070CD0:
 	ldr r0, [r4]
 	ldr r1, =0x00003030
 	adds r0, r1
-	bl daycare_count_pokemon
+	bl CountPokemonInDaycare
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0
@@ -2389,7 +1161,7 @@ sub_8070CF8: @ 8070CF8
 	ldr r0, [r0]
 	ldr r1, =0x00003030
 	adds r0, r1
-	bl daycare_count_pokemon
+	bl CountPokemonInDaycare
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0
@@ -2844,7 +1616,7 @@ _08071046:
 	adds r1, 0x88
 	adds r1, r2
 	ldr r1, [r1]
-	bl sub_806FDEC
+	bl GetLevelAfterDaycareSteps
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -2981,7 +1753,7 @@ sub_8071148: @ 8071148
 	adds r4, 0x88
 	adds r4, r1
 	ldr r1, [r4]
-	bl sub_806FDEC
+	bl GetLevelAfterDaycareSteps
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24