More pokemon related decomp (#48)

* add struct names

* decompile SaveRecruitedPokemon

* decompile ReadRecruitedPokemon

* decomp anotha one

* some renaming

* another save function

* more backup functions

* sub_808E400

* only one function left in pokemon_2.s

* decomp one more function

* merge 2 structs

1 files changed, 1 insertions, 175 deletions

diff --git a/asm/pokemon_2.s b/asm/pokemon_2.s
index cf8c39d..dec099a 100644
--- a/asm/pokemon_2.s
+++ b/asm/pokemon_2.s
@@ -3,181 +3,7 @@
 
 	.syntax unified
 
-	.text
-	
-	thumb_func_start sub_808E400
-sub_808E400:
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	lsls r0, 16
-	asrs r0, 16
-	mov r9, r0
-	lsls r2, 24
-	lsrs r2, 24
-	str r2, [sp]
-	lsls r3, 24
-	lsrs r3, 24
-	str r3, [sp, 0x4]
-	movs r0, 0
-	mov r10, r0
-	movs r7, 0x1
-	adds r6, r1, 0
-_0808E426:
-	lsls r0, r7, 16
-	asrs r5, r0, 16
-	mov r8, r5
-	adds r0, r5, 0
-	bl GetPokemonEvolveFrom
-	lsls r0, 16
-	asrs r0, 16
-	cmp r9, r0
-	bne _0808E46C
-	ldr r0, [sp]
-	cmp r0, 0
-	bne _0808E456
-	mov r0, r9
-	bl GetPokemonSize
-	adds r4, r0, 0
-	adds r0, r5, 0
-	bl GetPokemonSize
-	lsls r4, 24
-	lsls r0, 24
-	cmp r4, r0
-	bne _0808E46C
-_0808E456:
-	ldr r0, [sp, 0x4]
-	cmp r0, 0
-	bne _0808E462
-	ldr r0, _0808E488
-	cmp r5, r0
-	beq _0808E46C
-_0808E462:
-	mov r0, r8
-	strh r0, [r6]
-	adds r6, 0x2
-	movs r0, 0x1
-	add r10, r0
-_0808E46C:
-	adds r7, 0x1
-	ldr r0, _0808E48C
-	cmp r7, r0
-	ble _0808E426
-	mov r0, r10
-	add sp, 0x8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0808E488: .4byte 0x0000013d
-_0808E48C: .4byte 0x000001a7
-	thumb_func_end sub_808E400
-
-	thumb_func_start sub_808E490
-sub_808E490:
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x20
-	mov r8, r0
-	lsls r1, 16
-	asrs r1, 16
-	ldr r3, _0808E4F8
-	mov r0, sp
-	movs r2, 0x1
-	bl sub_808E0AC
-	adds r7, r0, 0
-	cmp r7, 0
-	bne _0808E4B8
-	movs r7, 0x1
-	mov r1, sp
-	movs r0, 0xCC
-	lsls r0, 1
-	strh r0, [r1]
-_0808E4B8:
-	movs r4, 0
-	cmp r4, r7
-	bge _0808E4D8
-	mov r6, sp
-	mov r5, r8
-	adds r4, r7, 0
-_0808E4C4:
-	ldrh r1, [r6]
-	adds r0, r5, 0
-	bl sub_8092AD4
-	adds r6, 0x2
-	adds r5, 0x8
-	subs r4, 0x1
-	cmp r4, 0
-	bne _0808E4C4
-	adds r4, r7, 0
-_0808E4D8:
-	cmp r4, 0x3
-	bgt _0808E4EC
-	movs r1, 0
-	lsls r0, r4, 3
-	add r0, r8
-_0808E4E2:
-	strb r1, [r0]
-	adds r0, 0x8
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _0808E4E2
-_0808E4EC:
-	add sp, 0x20
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808E4F8: .4byte 0x000003e7
-	thumb_func_end sub_808E490
-
-	thumb_func_start sub_808E4FC
-sub_808E4FC:
-	push {lr}
-	sub sp, 0x10
-	ldr r1, _0808E518
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	mov r1, sp
-	bl sub_8097DF0
-	ldr r0, [sp]
-	ldr r0, [r0]
-	add sp, 0x10
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0808E518: .4byte gFormattedStatusNames
-	thumb_func_end sub_808E4FC
-
-	thumb_func_start sub_808E51C
-sub_808E51C:
-	push {lr}
-	sub sp, 0x10
-	ldr r1, _0808E538
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	mov r1, sp
-	bl sub_8097DF0
-	ldr r0, [sp]
-	ldr r0, [r0, 0x4]
-	add sp, 0x10
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0808E538: .4byte gFormattedStatusNames
-	thumb_func_end sub_808E51C
+ 	.text
 
 	thumb_func_start sub_808E53C
 sub_808E53C: