Sese's vacation work

1 files changed, 0 insertions, 678 deletions

diff --git a/asm/friend_rescue.s b/asm/friend_rescue.s
index ebe5fab..e76fedf 100644
--- a/asm/friend_rescue.s
+++ b/asm/friend_rescue.s
@@ -4525,682 +4525,4 @@ _08034D48:
 _08034D50: .4byte gUnknown_203B33C
 	thumb_func_end sub_8034C98
 
-	thumb_func_start sub_8034D54
-sub_8034D54:
-	push {lr}
-	sub sp, 0x4
-	mov r0, sp
-	bl sub_80144A4
-	cmp r0, 0
-	bne _08034D6E
-	movs r0, 0x65
-	bl sub_80338C4
-	movs r0, 0
-	bl PrepareSavePakWrite
-_08034D6E:
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8034D54
-
-	thumb_func_start sub_8034D74
-sub_8034D74:
-	push {r4,r5,lr}
-	sub sp, 0x44
-	bl sub_80154F0
-	adds r4, r0, 0
-	add r0, sp, 0x14
-	movs r1, 0
-	movs r2, 0x30
-	bl MemoryFill8
-	cmp r4, 0x2
-	bne _08034D8E
-	b _08034E9C
-_08034D8E:
-	cmp r4, 0x3
-	beq _08034D94
-	b _08034EBC
-_08034D94:
-	ldr r0, _08034DB4
-	ldr r1, [r0]
-	adds r1, 0x8
-	movs r0, 0x20
-	add r2, sp, 0x14
-	bl sub_8039068
-	subs r0, 0x7
-	cmp r0, 0x11
-	bhi _08034E90
-	lsls r0, 2
-	ldr r1, _08034DB8
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08034DB4: .4byte gUnknown_203B33C
-_08034DB8: .4byte _08034DBC
-	.align 2, 0
-_08034DBC:
-	.4byte _08034E90
-	.4byte _08034E90
-	.4byte _08034E90
-	.4byte _08034E90
-	.4byte _08034E38
-	.4byte _08034E90
-	.4byte _08034E90
-	.4byte _08034E90
-	.4byte _08034E90
-	.4byte _08034E90
-	.4byte _08034E04
-	.4byte _08034E90
-	.4byte _08034E90
-	.4byte _08034E30
-	.4byte _08034E90
-	.4byte _08034E90
-	.4byte _08034E90
-	.4byte _08034E54
-_08034E04:
-	ldr r0, _08034E28
-	ldr r3, _08034E2C
-	movs r2, 0
-	str r2, [sp]
-	movs r1, 0x4
-	str r1, [sp, 0x4]
-	str r2, [sp, 0x8]
-	str r2, [sp, 0xC]
-	adds r1, 0xFD
-	str r1, [sp, 0x10]
-	movs r1, 0
-	movs r2, 0x6
-	bl sub_8014248
-	movs r0, 0x74
-	bl sub_80338C4
-	b _08034E90
-	.align 2, 0
-_08034E28: .4byte gUnknown_80E48A8
-_08034E2C: .4byte gUnknown_80E2440
-_08034E30:
-	ldr r0, _08034E34
-	b _08034E3A
-	.align 2, 0
-_08034E34: .4byte gUnknown_80E49C4
-_08034E38:
-	ldr r0, _08034E4C
-_08034E3A:
-	ldr r3, _08034E50
-	movs r1, 0
-	movs r2, 0
-	bl sub_80141B4
-	movs r0, 0x6B
-	bl sub_80338C4
-	b _08034E90
-	.align 2, 0
-_08034E4C: .4byte gUnknown_80E4704
-_08034E50: .4byte 0x00000101
-_08034E54:
-	ldr r1, [sp, 0x24]
-	movs r0, 0x4
-	bl sub_809539C
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_8095228
-	adds r2, r0, 0
-	add r1, sp, 0x14
-	ldm r1!, {r3-r5}
-	stm r2!, {r3-r5}
-	ldm r1!, {r3-r5}
-	stm r2!, {r3-r5}
-	ldm r1!, {r3-r5}
-	stm r2!, {r3-r5}
-	ldm r1!, {r3-r5}
-	stm r2!, {r3-r5}
-	movs r1, 0x6
-	strb r1, [r0]
-	ldr r0, _08034E98
-	ldr r0, [r0]
-	movs r1, 0x84
-	lsls r1, 3
-	adds r0, r1
-	ldr r1, [sp, 0x24]
-	str r1, [r0]
-	movs r0, 0x6D
-	bl sub_80338C4
-_08034E90:
-	bl sub_80155F0
-	b _08034EBC
-	.align 2, 0
-_08034E98: .4byte gUnknown_203B33C
-_08034E9C:
-	bl sub_80155F0
-	bl ResetUnusedInputStruct
-	ldr r0, _08034EC4
-	ldr r0, [r0]
-	movs r3, 0xEF
-	lsls r3, 2
-	adds r0, r3
-	movs r1, 0x1
-	movs r2, 0x1
-	bl sub_800641C
-	movs r0, 0x1
-	bl sub_80338C4
-_08034EBC:
-	add sp, 0x44
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08034EC4: .4byte gUnknown_203B33C
-	thumb_func_end sub_8034D74
-
-	thumb_func_start sub_8034EC8
-sub_8034EC8:
-	push {lr}
-	sub sp, 0x4
-	mov r0, sp
-	bl sub_80144A4
-	cmp r0, 0
-	bne _08034EEA
-	bl WriteSavePak
-	lsls r0, 24
-	cmp r0, 0
-	bne _08034EEA
-	bl FinishWriteSavePak
-	movs r0, 0x2
-	bl sub_80338C4
-_08034EEA:
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8034EC8
-
-	thumb_func_start sub_8034EF0
-sub_8034EF0:
-	push {lr}
-	sub sp, 0x4
-	mov r0, sp
-	bl sub_80144A4
-	cmp r0, 0
-	bne _08034F12
-	bl WriteSavePak
-	lsls r0, 24
-	cmp r0, 0
-	bne _08034F12
-	bl FinishWriteSavePak
-	movs r0, 0x2
-	bl sub_80338C4
-_08034F12:
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8034EF0
-
-	thumb_func_start sub_8034F18
-sub_8034F18:
-	push {lr}
-	sub sp, 0x4
-	mov r0, sp
-	bl sub_80144A4
-	cmp r0, 0
-	bne _08034F32
-	movs r0, 0x65
-	bl sub_80338C4
-	movs r0, 0
-	bl PrepareSavePakWrite
-_08034F32:
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8034F18
-
-	thumb_func_start sub_8034F38
-sub_8034F38:
-	push {lr}
-	sub sp, 0x4
-	mov r0, sp
-	bl sub_80144A4
-	cmp r0, 0
-	bne _08034F52
-	movs r0, 0x71
-	bl sub_80338C4
-	movs r0, 0
-	bl PrepareSavePakWrite
-_08034F52:
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8034F38
-
-	thumb_func_start sub_8034F58
-sub_8034F58:
-	push {lr}
-	sub sp, 0x4
-	mov r0, sp
-	bl sub_80144A4
-	cmp r0, 0
-	bne _08034F80
-	ldr r0, [sp]
-	cmp r0, 0x6
-	beq _08034F72
-	cmp r0, 0x8
-	beq _08034F7A
-	b _08034F80
-_08034F72:
-	movs r0, 0x62
-	bl sub_80338C4
-	b _08034F80
-_08034F7A:
-	movs r0, 0x1
-	bl sub_80338C4
-_08034F80:
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8034F58
-
-	thumb_func_start sub_8034F88
-sub_8034F88:
-	push {r4,r5,lr}
-	sub sp, 0x4
-	mov r0, sp
-	bl sub_80144A4
-	cmp r0, 0
-	bne _0803500E
-	ldr r0, [sp]
-	cmp r0, 0x7
-	beq _08035000
-	cmp r0, 0x7
-	bgt _08034FA6
-	cmp r0, 0x6
-	beq _08034FAC
-	b _0803500E
-_08034FA6:
-	cmp r0, 0x8
-	beq _08035008
-	b _0803500E
-_08034FAC:
-	ldr r4, _08034FF0
-	ldr r0, [r4]
-	movs r1, 0x86
-	lsls r1, 2
-	adds r0, r1
-	ldrb r0, [r0]
-	bl sub_8095228
-	adds r2, r0, 0
-	ldr r1, [r4]
-	ldr r3, _08034FF4
-	adds r0, r1, r3
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08034FD2
-	ldr r5, _08034FF8
-	adds r0, r1, r5
-	ldr r0, [r0]
-	str r0, [r2, 0x20]
-_08034FD2:
-	ldr r0, _08034FFC
-	ldr r1, [r0]
-	ldr r0, [r4]
-	adds r0, r3
-	ldrb r0, [r0]
-	lsls r0, 1
-	adds r1, 0x50
-	adds r1, r0
-	ldrh r0, [r1]
-	subs r0, 0x1
-	strh r0, [r1]
-	movs r0, 0x75
-	bl sub_80338C4
-	b _0803500E
-	.align 2, 0
-_08034FF0: .4byte gUnknown_203B33C
-_08034FF4: .4byte 0x0000041e
-_08034FF8: .4byte 0x0000041c
-_08034FFC: .4byte gUnknown_203B460
-_08035000:
-	movs r0, 0x57
-	bl sub_80338C4
-	b _0803500E
-_08035008:
-	movs r0, 0x1
-	bl sub_80338C4
-_0803500E:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8034F88
-
-	thumb_func_start sub_8035018
-sub_8035018:
-	push {lr}
-	sub sp, 0x4
-	mov r0, sp
-	bl sub_80144A4
-	cmp r0, 0
-	bne _08035032
-	movs r0, 0x76
-	bl sub_80338C4
-	movs r0, 0
-	bl PrepareSavePakWrite
-_08035032:
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8035018
-
-	thumb_func_start sub_8035038
-sub_8035038:
-	push {lr}
-	sub sp, 0x4
-	mov r0, sp
-	bl sub_80144A4
-	cmp r0, 0
-	bne _0803508E
-	bl WriteSavePak
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803508E
-	bl FinishWriteSavePak
-	ldr r0, _0803506C
-	ldr r0, [r0]
-	ldr r1, _08035070
-	adds r0, r1
-	ldr r0, [r0]
-	cmp r0, 0xD
-	beq _08035080
-	cmp r0, 0xD
-	bls _08035074
-	cmp r0, 0xE
-	beq _08035088
-	b _0803508E
-	.align 2, 0
-_0803506C: .4byte gUnknown_203B33C
-_08035070: .4byte 0x00000524
-_08035074:
-	cmp r0, 0xB
-	bcc _0803508E
-	movs r0, 0x69
-	bl sub_80338C4
-	b _0803508E
-_08035080:
-	movs r0, 0x66
-	bl sub_80338C4
-	b _0803508E
-_08035088:
-	movs r0, 0x4B
-	bl sub_80338C4
-_0803508E:
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8035038
-
-	thumb_func_start sub_8035094
-sub_8035094:
-	push {lr}
-	sub sp, 0x4
-	mov r0, sp
-	bl sub_80144A4
-	cmp r0, 0
-	bne _080350EE
-	ldr r0, [sp]
-	cmp r0, 0x8
-	beq _080350E8
-	cmp r0, 0x16
-	bne _080350EE
-	ldr r0, _080350C4
-	ldr r0, [r0]
-	ldr r1, _080350C8
-	adds r0, r1
-	ldr r0, [r0]
-	cmp r0, 0xD
-	beq _080350D8
-	cmp r0, 0xD
-	bls _080350CC
-	cmp r0, 0xE
-	beq _080350E0
-	b _080350EE
-	.align 2, 0
-_080350C4: .4byte gUnknown_203B33C
-_080350C8: .4byte 0x00000524
-_080350CC:
-	cmp r0, 0xB
-	bcc _080350EE
-	movs r0, 0x69
-	bl sub_80338C4
-	b _080350EE
-_080350D8:
-	movs r0, 0x66
-	bl sub_80338C4
-	b _080350EE
-_080350E0:
-	movs r0, 0x4B
-	bl sub_80338C4
-	b _080350EE
-_080350E8:
-	movs r0, 0x1
-	bl sub_80338C4
-_080350EE:
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8035094
-
-	thumb_func_start sub_80350F4
-sub_80350F4:
-	push {lr}
-	sub sp, 0x4
-	mov r0, sp
-	bl sub_80144A4
-	cmp r0, 0
-	bne _08035176
-	ldr r0, [sp]
-	cmp r0, 0x15
-	beq _08035118
-	cmp r0, 0x15
-	bgt _08035112
-	cmp r0, 0x8
-	beq _08035170
-	b _08035176
-_08035112:
-	cmp r0, 0x16
-	beq _08035134
-	b _08035176
-_08035118:
-	movs r0, 0
-	bl sub_801CF14
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803512C
-	movs r0, 0x56
-	bl sub_80338C4
-	b _08035176
-_0803512C:
-	movs r0, 0x57
-	bl sub_80338C4
-	b _08035176
-_08035134:
-	ldr r0, _0803514C
-	ldr r0, [r0]
-	ldr r1, _08035150
-	adds r0, r1
-	ldr r0, [r0]
-	cmp r0, 0xD
-	beq _08035160
-	cmp r0, 0xD
-	bls _08035154
-	cmp r0, 0xE
-	beq _08035168
-	b _08035176
-	.align 2, 0
-_0803514C: .4byte gUnknown_203B33C
-_08035150: .4byte 0x00000524
-_08035154:
-	cmp r0, 0xB
-	bcc _08035176
-	movs r0, 0x69
-	bl sub_80338C4
-	b _08035176
-_08035160:
-	movs r0, 0x66
-	bl sub_80338C4
-	b _08035176
-_08035168:
-	movs r0, 0x4B
-	bl sub_80338C4
-	b _08035176
-_08035170:
-	movs r0, 0x1
-	bl sub_80338C4
-_08035176:
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80350F4
-
-	thumb_func_start sub_803517C
-sub_803517C:
-	push {lr}
-	sub sp, 0x4
-	mov r0, sp
-	bl sub_80144A4
-	cmp r0, 0
-	bne _080351DA
-	ldr r0, [sp]
-	cmp r0, 0x6
-	beq _08035196
-	cmp r0, 0x8
-	beq _080351D4
-	b _080351DA
-_08035196:
-	ldr r0, _080351B0
-	ldr r0, [r0]
-	ldr r1, _080351B4
-	adds r0, r1
-	ldr r0, [r0]
-	cmp r0, 0xD
-	beq _080351C4
-	cmp r0, 0xD
-	bls _080351B8
-	cmp r0, 0xE
-	beq _080351CC
-	b _080351DA
-	.align 2, 0
-_080351B0: .4byte gUnknown_203B33C
-_080351B4: .4byte 0x00000524
-_080351B8:
-	cmp r0, 0xB
-	bcc _080351DA
-	movs r0, 0x69
-	bl sub_80338C4
-	b _080351DA
-_080351C4:
-	movs r0, 0x66
-	bl sub_80338C4
-	b _080351DA
-_080351CC:
-	movs r0, 0x4B
-	bl sub_80338C4
-	b _080351DA
-_080351D4:
-	movs r0, 0x1
-	bl sub_80338C4
-_080351DA:
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	thumb_func_end sub_803517C
-
-	thumb_func_start sub_80351E0
-sub_80351E0:
-	push {lr}
-	sub sp, 0x4
-	mov r0, sp
-	bl sub_80144A4
-	cmp r0, 0
-	bne _08035208
-	ldr r0, [sp]
-	cmp r0, 0x6
-	beq _080351FA
-	cmp r0, 0x8
-	beq _08035202
-	b _08035208
-_080351FA:
-	movs r0, 0x72
-	bl sub_80338C4
-	b _08035208
-_08035202:
-	movs r0, 0x1
-	bl sub_80338C4
-_08035208:
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80351E0
-
-	thumb_func_start sub_8035210
-sub_8035210:
-	push {lr}
-	sub sp, 0x4
-	mov r0, sp
-	bl sub_80144A4
-	cmp r0, 0
-	bne _0803528C
-	ldr r0, _08035238
-	ldr r2, [r0]
-	ldr r1, _0803523C
-	adds r0, r2, r1
-	ldr r1, [sp]
-	str r1, [r0]
-	cmp r1, 0xD
-	bgt _0803528C
-	cmp r1, 0xB
-	bge _08035240
-	cmp r1, 0x8
-	beq _08035286
-	b _0803528C
-	.align 2, 0
-_08035238: .4byte gUnknown_203B33C
-_0803523C: .4byte 0x00000524
-_08035240:
-	movs r3, 0xA5
-	lsls r3, 3
-	adds r0, r2, r3
-	ldr r0, [r0]
-	cmp r0, 0x13
-	bne _08035272
-	movs r0, 0x5
-	bl sub_80953D4
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_8095228
-	adds r0, 0x22
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0803526A
-	movs r0, 0x53
-	bl sub_80338C4
-	b _0803528C
-_0803526A:
-	movs r0, 0x55
-	bl sub_80338C4
-	b _0803528C
-_08035272:
-	cmp r1, 0xD
-	beq _0803527E
-	movs r0, 0x69
-	bl sub_80338C4
-	b _0803528C
-_0803527E:
-	movs r0, 0x72
-	bl sub_80338C4
-	b _0803528C
-_08035286:
-	movs r0, 0x1
-	bl sub_80338C4
-_0803528C:
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8035210
-
         .align 2,0