decomp some more saving functions

1 files changed, 0 insertions, 484 deletions

diff --git a/asm/code_8095014.s b/asm/code_8095014.s
index 228811d..d5e9a35 100644
--- a/asm/code_8095014.s
+++ b/asm/code_8095014.s
@@ -452,488 +452,4 @@ sub_8095494:
 _080954B0: .4byte gUnknown_203B480
 	thumb_func_end sub_8095494
 
-	thumb_func_start sub_80954B4
-sub_80954B4:
-	push {lr}
-	movs r0, 0x3
-	bl sub_8095324
-	cmp r0, 0
-	bne _080954C4
-	movs r0, 0
-	b _080954C6
-_080954C4:
-	movs r0, 0x1
-_080954C6:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80954B4
-
-	thumb_func_start sub_80954CC
-sub_80954CC:
-	push {r4-r6,lr}
-	sub sp, 0x10
-	adds r3, r0, 0
-	adds r2, r1, 0
-	mov r0, sp
-	adds r1, r3, 0
-	bl xxx_init_struct_8094924_restore_809485C
-	ldr r6, _08095618
-	movs r5, 0
-	movs r4, 0x1F
-_080954E2:
-	ldr r1, [r6]
-	adds r1, r5
-	mov r0, sp
-	bl sub_8095774
-	adds r5, 0x30
-	subs r4, 0x1
-	cmp r4, 0
-	bge _080954E2
-	ldr r4, _0809561C
-	ldr r1, [r4]
-	mov r0, sp
-	movs r2, 0x20
-	bl RestoreIntegerBits
-	ldr r5, [r4]
-	adds r4, r5, 0x4
-	adds r0, r4, 0
-	movs r1, 0
-	movs r2, 0x58
-	bl memset
-	mov r0, sp
-	adds r1, r4, 0
-	movs r2, 0x2
-	bl RestoreIntegerBits
-	adds r1, r5, 0x6
-	mov r0, sp
-	movs r2, 0x1
-	bl RestoreIntegerBits
-	adds r1, r5, 0x7
-	mov r0, sp
-	movs r2, 0x7
-	bl RestoreIntegerBits
-	adds r4, 0x4
-	mov r0, sp
-	adds r1, r4, 0
-	bl xxx_restore_poke_sub_4_8090314
-	adds r1, r5, 0
-	adds r1, 0xC
-	mov r0, sp
-	movs r2, 0x9
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x10
-	mov r0, sp
-	bl xxx_restore_poke_sub_c_808F410
-	adds r1, r5, 0
-	adds r1, 0x14
-	mov r0, sp
-	bl xxx_restore_poke_sub_c_808F410
-	adds r1, r5, 0
-	adds r1, 0x18
-	mov r0, sp
-	movs r2, 0xA
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x1A
-	mov r0, sp
-	movs r2, 0xA
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x1C
-	mov r0, sp
-	movs r2, 0x8
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x1D
-	mov r0, sp
-	movs r2, 0x8
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x1E
-	mov r0, sp
-	movs r2, 0x8
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x1F
-	mov r0, sp
-	movs r2, 0x8
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x20
-	mov r0, sp
-	movs r2, 0x18
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x24
-	mov r0, sp
-	movs r2, 0x18
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x28
-	mov r0, sp
-	movs r2, 0x4
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x2C
-	mov r0, sp
-	bl RestoreHeldItem
-	adds r1, r5, 0
-	adds r1, 0x30
-	mov r0, sp
-	bl RestorePokemonMoves
-	adds r1, r5, 0
-	adds r1, 0x50
-	mov r0, sp
-	movs r2, 0x50
-	bl RestoreIntegerBits
-	ldr r4, _08095620
-	ldr r1, [r4]
-	mov r0, sp
-	movs r2, 0x20
-	bl RestoreIntegerBits
-	adds r6, r4, 0
-	movs r5, 0x4
-	movs r4, 0x1F
-_080955F4:
-	ldr r1, [r6]
-	adds r1, r5
-	mov r0, sp
-	movs r2, 0x20
-	bl RestoreIntegerBits
-	adds r5, 0x4
-	subs r4, 0x1
-	cmp r4, 0
-	bge _080955F4
-	mov r0, sp
-	bl nullsub_102
-	ldr r0, [sp, 0x8]
-	add sp, 0x10
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08095618: .4byte gUnknown_203B480
-_0809561C: .4byte gUnknown_203B484
-_08095620: .4byte gUnknown_203B48C
-	thumb_func_end sub_80954CC
-
-	thumb_func_start sub_8095624
-sub_8095624:
-	push {r4-r6,lr}
-	sub sp, 0x10
-	adds r3, r0, 0
-	adds r2, r1, 0
-	mov r0, sp
-	adds r1, r3, 0
-	bl xxx_init_struct_8094924_save_809486C
-	ldr r6, _08095768
-	movs r5, 0
-	movs r4, 0x1F
-_0809563A:
-	ldr r1, [r6]
-	adds r1, r5
-	mov r0, sp
-	bl sub_8095824
-	adds r5, 0x30
-	subs r4, 0x1
-	cmp r4, 0
-	bge _0809563A
-	ldr r4, _0809576C
-	ldr r1, [r4]
-	mov r0, sp
-	movs r2, 0x20
-	bl SaveIntegerBits
-	ldr r5, [r4]
-	adds r4, r5, 0x4
-	mov r0, sp
-	adds r1, r4, 0
-	movs r2, 0x2
-	bl SaveIntegerBits
-	adds r1, r5, 0x6
-	mov r0, sp
-	movs r2, 0x1
-	bl SaveIntegerBits
-	adds r1, r5, 0x7
-	mov r0, sp
-	movs r2, 0x7
-	bl SaveIntegerBits
-	adds r4, 0x4
-	mov r0, sp
-	adds r1, r4, 0
-	bl xxx_save_poke_sub_4_80902F4
-	adds r1, r5, 0
-	adds r1, 0xC
-	mov r0, sp
-	movs r2, 0x9
-	bl SaveIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x10
-	mov r0, sp
-	bl xxx_save_poke_sub_c_808F41C
-	adds r1, r5, 0
-	adds r1, 0x14
-	mov r0, sp
-	bl xxx_save_poke_sub_c_808F41C
-	adds r1, r5, 0
-	adds r1, 0x18
-	mov r0, sp
-	movs r2, 0xA
-	bl SaveIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x1A
-	mov r0, sp
-	movs r2, 0xA
-	bl SaveIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x1C
-	mov r0, sp
-	movs r2, 0x8
-	bl SaveIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x1D
-	mov r0, sp
-	movs r2, 0x8
-	bl SaveIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x1E
-	mov r0, sp
-	movs r2, 0x8
-	bl SaveIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x1F
-	mov r0, sp
-	movs r2, 0x8
-	bl SaveIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x20
-	mov r0, sp
-	movs r2, 0x18
-	bl SaveIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x24
-	mov r0, sp
-	movs r2, 0x18
-	bl SaveIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x28
-	mov r0, sp
-	movs r2, 0x4
-	bl SaveIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x2C
-	mov r0, sp
-	bl SaveHeldItem
-	adds r1, r5, 0
-	adds r1, 0x30
-	mov r0, sp
-	bl SavePokemonMoves
-	adds r1, r5, 0
-	adds r1, 0x50
-	mov r0, sp
-	movs r2, 0x50
-	bl SaveIntegerBits
-	ldr r4, _08095770
-	ldr r1, [r4]
-	mov r0, sp
-	movs r2, 0x20
-	bl SaveIntegerBits
-	adds r6, r4, 0
-	movs r5, 0x4
-	movs r4, 0x1F
-_08095742:
-	ldr r1, [r6]
-	adds r1, r5
-	mov r0, sp
-	movs r2, 0x20
-	bl SaveIntegerBits
-	adds r5, 0x4
-	subs r4, 0x1
-	cmp r4, 0
-	bge _08095742
-	mov r0, sp
-	bl nullsub_102
-	ldr r0, [sp, 0x8]
-	add sp, 0x10
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08095768: .4byte gUnknown_203B480
-_0809576C: .4byte gUnknown_203B484
-_08095770: .4byte gUnknown_203B48C
-	thumb_func_end sub_8095624
-
-	thumb_func_start sub_8095774
-sub_8095774:
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x4
-	bl RestoreIntegerBits
-	adds r1, r5, 0x4
-	adds r0, r4, 0
-	bl xxx_restore_poke_sub_4_8090314
-	adds r1, r5, 0
-	adds r1, 0x8
-	adds r0, r4, 0
-	movs r2, 0x18
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0xC
-	adds r0, r4, 0
-	movs r2, 0x9
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x10
-	adds r0, r4, 0
-	movs r2, 0x20
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x14
-	adds r0, r4, 0
-	movs r2, 0x50
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x20
-	adds r0, r4, 0
-	movs r2, 0x8
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x21
-	adds r0, r4, 0
-	movs r2, 0x8
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x22
-	adds r0, r4, 0
-	movs r2, 0x8
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x24
-	adds r0, r4, 0
-	movs r2, 0x20
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x28
-	adds r0, r4, 0
-	movs r2, 0x20
-	bl RestoreIntegerBits
-	adds r1, r5, 0
-	adds r1, 0x2C
-	adds r0, r4, 0
-	movs r2, 0x8
-	bl RestoreIntegerBits
-	adds r0, r4, 0
-	mov r1, sp
-	movs r2, 0x1
-	bl RestoreIntegerBits
-	mov r0, sp
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	adds r1, r5, 0
-	adds r1, 0x2D
-	strb r0, [r1]
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8095774
-
-	thumb_func_start sub_8095824
-sub_8095824:
-	push {r4-r6,lr}
-	sub sp, 0x4
-	adds r5, r0, 0
-	adds r4, r1, 0
-	movs r1, 0xFF
-	mov r0, sp
-	strb r1, [r0]
-	mov r6, sp
-	adds r6, 0x1
-	movs r0, 0
-	strb r0, [r6]
-	adds r0, r5, 0
-	adds r1, r4, 0
-	movs r2, 0x4
-	bl SaveIntegerBits
-	adds r1, r4, 0x4
-	adds r0, r5, 0
-	bl xxx_save_poke_sub_4_80902F4
-	adds r1, r4, 0
-	adds r1, 0x8
-	adds r0, r5, 0
-	movs r2, 0x18
-	bl SaveIntegerBits
-	adds r1, r4, 0
-	adds r1, 0xC
-	adds r0, r5, 0
-	movs r2, 0x9
-	bl SaveIntegerBits
-	adds r1, r4, 0
-	adds r1, 0x10
-	adds r0, r5, 0
-	movs r2, 0x20
-	bl SaveIntegerBits
-	adds r1, r4, 0
-	adds r1, 0x14
-	adds r0, r5, 0
-	movs r2, 0x50
-	bl SaveIntegerBits
-	adds r1, r4, 0
-	adds r1, 0x20
-	adds r0, r5, 0
-	movs r2, 0x8
-	bl SaveIntegerBits
-	adds r1, r4, 0
-	adds r1, 0x21
-	adds r0, r5, 0
-	movs r2, 0x8
-	bl SaveIntegerBits
-	adds r1, r4, 0
-	adds r1, 0x22
-	adds r0, r5, 0
-	movs r2, 0x8
-	bl SaveIntegerBits
-	adds r1, r4, 0
-	adds r1, 0x24
-	adds r0, r5, 0
-	movs r2, 0x20
-	bl SaveIntegerBits
-	adds r1, r4, 0
-	adds r1, 0x28
-	adds r0, r5, 0
-	movs r2, 0x20
-	bl SaveIntegerBits
-	adds r1, r4, 0
-	adds r1, 0x2C
-	adds r0, r5, 0
-	movs r2, 0x8
-	bl SaveIntegerBits
-	adds r0, r4, 0
-	adds r0, 0x2D
-	ldrb r0, [r0]
-	mov r1, sp
-	cmp r0, 0
-	bne _080958D2
-	adds r1, r6, 0
-_080958D2:
-	adds r0, r5, 0
-	movs r2, 0x1
-	bl SaveIntegerBits
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8095824
-
-	thumb_func_start sub_80958E4
-sub_80958E4:
-	str r1, [r0]
-	bx lr
-	thumb_func_end sub_80958E4
-
-
         .align 2,0