decompile up to sub_813D584

4 files changed, 230 insertions, 824 deletions

diff --git a/asm/intro.s b/asm/intro.s
index 010077848..afe79b068 100644
--- a/asm/intro.s
+++ b/asm/intro.s
@@ -6,818 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_813D158
-sub_813D158: @ 813D158
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r2, _0813D1CC @ =gSprites
-	movs r1, 0x3C
-	ldrsh r0, [r4, r1]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	movs r3, 0x3C
-	ldrsh r0, [r1, r3]
-	cmp r0, 0
-	beq _0813D1D4
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	ldrh r0, [r4, 0x24]
-	ldrh r1, [r4, 0x20]
-	adds r0, r1
-	strh r0, [r4, 0x20]
-	ldrh r0, [r4, 0x26]
-	ldrh r3, [r4, 0x22]
-	adds r0, r3
-	strh r0, [r4, 0x22]
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl StartSpriteAnim
-	movs r0, 0x80
-	lsls r0, 3
-	strh r0, [r4, 0x32]
-	ldrh r1, [r4, 0x30]
-	movs r0, 0x3
-	ands r0, r1
-	lsls r0, 3
-	strh r0, [r4, 0x34]
-	ldr r0, _0813D1D0 @ =sub_813D0CC
-	str r0, [r4, 0x1C]
-	ldrb r1, [r4, 0x1]
-	movs r0, 0x3F
-	ands r0, r1
-	movs r1, 0x40
-	orrs r0, r1
-	strb r0, [r4, 0x1]
-	ldrb r0, [r4, 0x3]
-	movs r1, 0xC0
-	orrs r0, r1
-	strb r0, [r4, 0x3]
-	adds r0, r4, 0
-	movs r1, 0x1
-	movs r2, 0x3
-	movs r3, 0x2
-	bl CalcCenterToCornerVec
-	b _0813D200
-	.align 2, 0
-_0813D1CC: .4byte gSprites
-_0813D1D0: .4byte sub_813D0CC
-_0813D1D4:
-	ldrh r0, [r1, 0x24]
-	strh r0, [r4, 0x24]
-	movs r0, 0x3C
-	ldrsh r1, [r4, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r0, [r0, 0x26]
-	strh r0, [r4, 0x26]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r0, [r0, 0x20]
-	strh r0, [r4, 0x20]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r0, [r0, 0x22]
-	strh r0, [r4, 0x22]
-_0813D200:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_813D158
-
-	thumb_func_start sub_813D208
-sub_813D208: @ 813D208
-	push {lr}
-	adds r1, r0, 0
-	movs r2, 0x2E
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	beq _0813D218
-	ldr r0, _0813D21C @ =sub_813D220
-	str r0, [r1, 0x1C]
-_0813D218:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813D21C: .4byte sub_813D220
-	thumb_func_end sub_813D208
-
-	thumb_func_start sub_813D220
-sub_813D220: @ 813D220
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	adds r7, r0, 0
-	ldrh r4, [r7, 0x20]
-	movs r1, 0x20
-	ldrsh r0, [r7, r1]
-	cmp r0, 0x74
-	bgt _0813D260
-	ldrh r0, [r7, 0x26]
-	ldrh r1, [r7, 0x22]
-	adds r0, r1
-	movs r1, 0
-	strh r0, [r7, 0x22]
-	strh r1, [r7, 0x26]
-	adds r0, r4, 0x4
-	strh r0, [r7, 0x20]
-	ldr r0, _0813D258 @ =0x0000fffc
-	strh r0, [r7, 0x24]
-	movs r0, 0x80
-	strh r0, [r7, 0x36]
-	ldr r0, _0813D25C @ =sub_813D368
-	str r0, [r7, 0x1C]
-	b _0813D352
-	.align 2, 0
-_0813D258: .4byte 0x0000fffc
-_0813D25C: .4byte sub_813D368
-_0813D260:
-	ldrh r1, [r7, 0x36]
-	ldr r5, _0813D364 @ =gSineTable
-	lsls r0, r1, 24
-	lsrs r0, 23
-	adds r0, r5
-	ldrh r2, [r0]
-	adds r0, r1, 0
-	adds r0, 0x40
-	lsls r0, 24
-	lsrs r0, 23
-	adds r0, r5
-	ldrh r3, [r0]
-	adds r1, 0x2
-	strh r1, [r7, 0x36]
-	lsls r2, 16
-	asrs r0, r2, 16
-	cmp r0, 0
-	bge _0813D286
-	adds r0, 0x1F
-_0813D286:
-	asrs r0, 5
-	strh r0, [r7, 0x26]
-	subs r0, r4, 0x1
-	strh r0, [r7, 0x20]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0813D29C
-	ldrh r0, [r7, 0x22]
-	adds r0, 0x1
-	strh r0, [r7, 0x22]
-_0813D29C:
-	lsls r0, r3, 16
-	asrs r0, 16
-	negs r0, r0
-	cmp r0, 0
-	bge _0813D2A8
-	adds r0, 0xF
-_0813D2A8:
-	lsls r1, r0, 12
-	lsrs r1, 16
-	ldrh r4, [r7, 0x32]
-	ldrh r3, [r7, 0x34]
-	adds r0, r1, 0
-	subs r0, 0x10
-	lsls r0, 24
-	lsrs r0, 23
-	adds r0, r5
-	ldrh r2, [r0]
-	adds r1, 0x30
-	lsls r1, 24
-	lsrs r1, 23
-	adds r1, r5
-	movs r0, 0
-	ldrsh r1, [r1, r0]
-	adds r0, r1, 0
-	muls r0, r4
-	cmp r0, 0
-	bge _0813D2D2
-	adds r0, 0xFF
-_0813D2D2:
-	lsls r0, 8
-	lsrs r0, 16
-	mov r8, r0
-	lsls r0, r2, 16
-	asrs r2, r0, 16
-	negs r0, r2
-	muls r0, r3
-	cmp r0, 0
-	bge _0813D2E6
-	adds r0, 0xFF
-_0813D2E6:
-	lsls r0, 8
-	lsrs r0, 16
-	mov r10, r0
-	adds r0, r2, 0
-	muls r0, r4
-	cmp r0, 0
-	bge _0813D2F6
-	adds r0, 0xFF
-_0813D2F6:
-	lsls r0, 8
-	lsrs r5, r0, 16
-	adds r0, r1, 0
-	muls r0, r3
-	cmp r0, 0
-	bge _0813D304
-	adds r0, 0xFF
-_0813D304:
-	lsls r6, r0, 8
-	lsrs r6, 16
-	ldrh r0, [r7, 0x30]
-	lsls r0, 24
-	lsrs r0, 24
-	str r3, [sp]
-	adds r1, r4, 0
-	movs r2, 0
-	movs r3, 0
-	bl SetOamMatrix
-	ldrh r0, [r7, 0x30]
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r5
-	mov r1, r10
-	lsls r5, r1, 16
-	lsrs r3, r5, 16
-	lsls r4, r6, 16
-	str r6, [sp]
-	mov r1, r8
-	mov r2, r9
-	bl SetOamMatrix
-	ldrh r0, [r7, 0x30]
-	adds r0, 0x2
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r5, 1
-	lsrs r5, 16
-	lsls r4, 1
-	lsrs r4, 16
-	str r4, [sp]
-	mov r1, r8
-	mov r2, r9
-	adds r3, r5, 0
-	bl SetOamMatrix
-_0813D352:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813D364: .4byte gSineTable
-	thumb_func_end sub_813D220
-
-	thumb_func_start sub_813D368
-sub_813D368: @ 813D368
-	push {r4,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x30]
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x3A]
-	adds r1, 0x40
-	lsls r1, 16
-	lsrs r1, 16
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0
-	bl SetOamMatrix
-	ldrh r0, [r4, 0x30]
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x3A]
-	adds r1, 0x40
-	lsls r1, 16
-	lsrs r1, 16
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0
-	bl SetOamMatrix
-	ldrh r0, [r4, 0x30]
-	adds r0, 0x2
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x3A]
-	adds r1, 0x40
-	lsls r1, 16
-	lsrs r1, 16
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0
-	bl SetOamMatrix
-	ldrh r1, [r4, 0x36]
-	movs r2, 0x36
-	ldrsh r0, [r4, r2]
-	cmp r0, 0x40
-	beq _0813D400
-	adds r0, r1, 0
-	subs r0, 0x8
-	strh r0, [r4, 0x36]
-	ldrh r0, [r4, 0x36]
-	adds r1, r0, 0
-	ldr r2, _0813D3FC @ =gSineTable
-	adds r0, 0x40
-	lsls r0, 24
-	lsrs r0, 23
-	adds r0, r2
-	movs r3, 0
-	ldrsh r0, [r0, r3]
-	cmp r0, 0
-	bge _0813D3E2
-	adds r0, 0x3F
-_0813D3E2:
-	asrs r0, 6
-	strh r0, [r4, 0x24]
-	lsls r0, r1, 24
-	lsrs r0, 23
-	adds r0, r2
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bge _0813D3F6
-	adds r0, 0x3F
-_0813D3F6:
-	asrs r0, 6
-	strh r0, [r4, 0x26]
-	b _0813D408
-	.align 2, 0
-_0813D3FC: .4byte gSineTable
-_0813D400:
-	movs r0, 0
-	strh r0, [r4, 0x36]
-	ldr r0, _0813D410 @ =sub_813D414
-	str r0, [r4, 0x1C]
-_0813D408:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813D410: .4byte sub_813D414
-	thumb_func_end sub_813D368
-
-	thumb_func_start sub_813D414
-sub_813D414: @ 813D414
-	push {r4,lr}
-	adds r1, r0, 0
-	movs r2, 0x2E
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x2
-	beq _0813D474
-	ldrh r0, [r1, 0x36]
-	adds r0, 0x8
-	strh r0, [r1, 0x36]
-	ldr r3, _0813D470 @ =gSineTable
-	lsls r0, 24
-	lsrs r0, 23
-	adds r0, r3
-	movs r4, 0
-	ldrsh r0, [r0, r4]
-	cmp r0, 0
-	bge _0813D438
-	adds r0, 0xF
-_0813D438:
-	asrs r0, 4
-	adds r0, 0x40
-	lsls r0, 16
-	lsrs r2, r0, 16
-	adds r0, r2, 0
-	adds r0, 0x40
-	lsls r0, 24
-	lsrs r0, 23
-	adds r0, r3
-	movs r4, 0
-	ldrsh r0, [r0, r4]
-	cmp r0, 0
-	bge _0813D454
-	adds r0, 0x3F
-_0813D454:
-	asrs r0, 6
-	strh r0, [r1, 0x24]
-	lsls r0, r2, 24
-	lsrs r0, 23
-	adds r0, r3
-	movs r2, 0
-	ldrsh r0, [r0, r2]
-	cmp r0, 0
-	bge _0813D468
-	adds r0, 0x3F
-_0813D468:
-	asrs r0, 6
-	strh r0, [r1, 0x26]
-	b _0813D478
-	.align 2, 0
-_0813D470: .4byte gSineTable
-_0813D474:
-	ldr r0, _0813D480 @ =sub_813D484
-	str r0, [r1, 0x1C]
-_0813D478:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813D480: .4byte sub_813D484
-	thumb_func_end sub_813D414
-
-	thumb_func_start sub_813D484
-sub_813D484: @ 813D484
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r2, [r4, 0x22]
-	movs r0, 0x22
-	ldrsh r1, [r4, r0]
-	movs r3, 0x38
-	ldrsh r0, [r4, r3]
-	cmp r1, r0
-	bge _0813D49C
-	adds r0, r2, 0x4
-	strh r0, [r4, 0x22]
-	b _0813D4F8
-_0813D49C:
-	movs r0, 0x1
-	strh r0, [r4, 0x3C]
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	ldrh r0, [r4, 0x24]
-	ldrh r1, [r4, 0x20]
-	adds r0, r1
-	strh r0, [r4, 0x20]
-	ldrh r0, [r4, 0x26]
-	ldrh r3, [r4, 0x22]
-	adds r0, r3
-	strh r0, [r4, 0x22]
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl StartSpriteAnim
-	movs r0, 0x80
-	lsls r0, 3
-	strh r0, [r4, 0x32]
-	ldrh r1, [r4, 0x30]
-	movs r0, 0x3
-	ands r0, r1
-	lsls r0, 3
-	strh r0, [r4, 0x34]
-	ldr r0, _0813D500 @ =sub_813D0CC
-	str r0, [r4, 0x1C]
-	ldrb r1, [r4, 0x1]
-	movs r0, 0x3F
-	ands r0, r1
-	movs r1, 0x40
-	orrs r0, r1
-	strb r0, [r4, 0x1]
-	ldrb r0, [r4, 0x3]
-	movs r1, 0xC0
-	orrs r0, r1
-	strb r0, [r4, 0x3]
-	adds r0, r4, 0
-	movs r1, 0x1
-	movs r2, 0x3
-	movs r3, 0x2
-	bl CalcCenterToCornerVec
-_0813D4F8:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813D500: .4byte sub_813D0CC
-	thumb_func_end sub_813D484
-
-	thumb_func_start sub_813D504
-sub_813D504: @ 813D504
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r2, [r4, 0x22]
-	movs r0, 0x22
-	ldrsh r1, [r4, r0]
-	movs r3, 0x38
-	ldrsh r0, [r4, r3]
-	cmp r1, r0
-	bge _0813D51C
-	adds r0, r2, 0x4
-	strh r0, [r4, 0x22]
-	b _0813D578
-_0813D51C:
-	movs r0, 0x1
-	strh r0, [r4, 0x3C]
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	ldrh r0, [r4, 0x24]
-	ldrh r1, [r4, 0x20]
-	adds r0, r1
-	strh r0, [r4, 0x20]
-	ldrh r0, [r4, 0x26]
-	ldrh r3, [r4, 0x22]
-	adds r0, r3
-	strh r0, [r4, 0x22]
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl StartSpriteAnim
-	movs r0, 0x80
-	lsls r0, 3
-	strh r0, [r4, 0x32]
-	ldrh r1, [r4, 0x30]
-	movs r0, 0x3
-	ands r0, r1
-	lsls r0, 3
-	strh r0, [r4, 0x34]
-	ldr r0, _0813D580 @ =sub_813D0CC
-	str r0, [r4, 0x1C]
-	ldrb r1, [r4, 0x1]
-	movs r0, 0x3F
-	ands r0, r1
-	movs r1, 0x40
-	orrs r0, r1
-	strb r0, [r4, 0x1]
-	ldrb r0, [r4, 0x3]
-	movs r1, 0xC0
-	orrs r0, r1
-	strb r0, [r4, 0x3]
-	adds r0, r4, 0
-	movs r1, 0x1
-	movs r2, 0x3
-	movs r3, 0x2
-	bl CalcCenterToCornerVec
-_0813D578:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813D580: .4byte sub_813D0CC
-	thumb_func_end sub_813D504
-
-	thumb_func_start sub_813D584
-sub_813D584: @ 813D584
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x14
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldr r6, [sp, 0x34]
-	ldr r0, [sp, 0x38]
-	mov r8, r0
-	lsls r4, 16
-	lsls r5, 16
-	lsls r2, 16
-	lsrs r2, 16
-	str r2, [sp, 0x8]
-	lsls r3, 16
-	lsrs r3, 16
-	str r3, [sp, 0xC]
-	lsls r6, 16
-	lsrs r6, 16
-	mov r1, r8
-	lsls r1, 24
-	lsrs r1, 24
-	mov r8, r1
-	ldr r0, _0813D640 @ =gSpriteTemplate_840AE20
-	lsrs r2, r4, 16
-	mov r10, r2
-	asrs r4, 16
-	lsrs r1, r5, 16
-	str r1, [sp, 0x4]
-	asrs r5, 16
-	adds r1, r4, 0
-	adds r2, r5, 0
-	movs r3, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r2, _0813D644 @ =gSprites
-	mov r9, r2
-	lsls r0, r7, 4
-	adds r0, r7
-	lsls r5, r0, 2
-	adds r4, r5, r2
-	movs r0, 0
-	strh r0, [r4, 0x2E]
-	strh r0, [r4, 0x3C]
-	mov r0, sp
-	ldrh r0, [r0, 0xC]
-	strh r0, [r4, 0x30]
-	mov r1, sp
-	ldrh r1, [r1, 0x8]
-	strh r1, [r4, 0x32]
-	mov r2, sp
-	ldrh r2, [r2, 0x8]
-	strh r2, [r4, 0x34]
-	strh r6, [r4, 0x38]
-	mov r0, sp
-	ldrh r0, [r0, 0x8]
-	strh r0, [r4, 0x3A]
-	ldrb r0, [r4, 0x1]
-	movs r1, 0x3
-	orrs r0, r1
-	strb r0, [r4, 0x1]
-	movs r0, 0x1F
-	ldr r1, [sp, 0xC]
-	ands r1, r0
-	lsls r1, 1
-	ldrb r2, [r4, 0x3]
-	movs r0, 0x3F
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r4, 0x3]
-	adds r0, r4, 0
-	movs r1, 0
-	movs r2, 0x2
-	movs r3, 0x2
-	bl CalcCenterToCornerVec
-	adds r0, r4, 0
-	movs r1, 0x2
-	bl StartSpriteAnim
-	mov r1, r8
-	cmp r1, 0
-	bne _0813D64C
-	mov r0, r9
-	adds r0, 0x1C
-	adds r0, r5, r0
-	ldr r1, _0813D648 @ =sub_813D208
-	b _0813D654
-	.align 2, 0
-_0813D640: .4byte gSpriteTemplate_840AE20
-_0813D644: .4byte gSprites
-_0813D648: .4byte sub_813D208
-_0813D64C:
-	mov r0, r9
-	adds r0, 0x1C
-	adds r0, r5, r0
-	ldr r1, _0813D774 @ =sub_813D504
-_0813D654:
-	str r1, [r0]
-	str r7, [sp, 0x10]
-	mov r2, r10
-	lsls r2, 16
-	asrs r2, 16
-	mov r10, r2
-	ldr r0, [sp, 0x4]
-	lsls r0, 16
-	asrs r0, 16
-	mov r8, r0
-	ldr r0, _0813D778 @ =gSpriteTemplate_840AE20
-	mov r1, r10
-	mov r2, r8
-	movs r3, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r5, _0813D77C @ =gSprites
-	lsls r4, r7, 4
-	adds r4, r7
-	lsls r4, 2
-	adds r0, r4, r5
-	mov r1, sp
-	ldrh r1, [r1, 0x10]
-	strh r1, [r0, 0x3C]
-	ldr r2, [sp, 0xC]
-	adds r2, 0x1
-	mov r9, r2
-	strh r2, [r0, 0x30]
-	ldrb r1, [r0, 0x1]
-	movs r2, 0x3
-	orrs r1, r2
-	strb r1, [r0, 0x1]
-	mov r2, r9
-	movs r1, 0x1F
-	ands r2, r1
-	lsls r2, 1
-	ldrb r3, [r0, 0x3]
-	movs r6, 0x3F
-	negs r6, r6
-	adds r1, r6, 0
-	ands r1, r3
-	orrs r1, r2
-	strb r1, [r0, 0x3]
-	movs r1, 0
-	movs r2, 0x2
-	movs r3, 0x2
-	bl CalcCenterToCornerVec
-	ldr r2, _0813D780 @ =gSprites + 0x1C
-	adds r4, r2
-	ldr r0, _0813D784 @ =sub_813D158
-	str r0, [r4]
-	ldr r0, _0813D778 @ =gSpriteTemplate_840AE20
-	mov r1, r10
-	mov r2, r8
-	movs r3, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r7, r0, 24
-	lsls r4, r7, 4
-	adds r4, r7
-	lsls r4, 2
-	adds r5, r4, r5
-	mov r1, sp
-	ldrh r1, [r1, 0x10]
-	strh r1, [r5, 0x3C]
-	ldr r2, [sp, 0xC]
-	adds r2, 0x2
-	mov r8, r2
-	strh r2, [r5, 0x30]
-	adds r0, r5, 0
-	movs r1, 0x1
-	bl StartSpriteAnim
-	ldrb r0, [r5, 0x1]
-	movs r1, 0x3
-	orrs r0, r1
-	strb r0, [r5, 0x1]
-	mov r0, r8
-	movs r2, 0x1F
-	ands r0, r2
-	lsls r0, 1
-	ldrb r1, [r5, 0x3]
-	ands r6, r1
-	orrs r6, r0
-	strb r6, [r5, 0x3]
-	adds r0, r5, 0
-	movs r1, 0
-	movs r2, 0x2
-	movs r3, 0x2
-	bl CalcCenterToCornerVec
-	ldr r0, _0813D780 @ =gSprites + 0x1C
-	adds r4, r0
-	ldr r1, _0813D784 @ =sub_813D158
-	str r1, [r4]
-	ldr r2, [sp, 0xC]
-	lsls r0, r2, 24
-	lsrs r0, 24
-	ldr r5, [sp, 0x8]
-	adds r5, 0x20
-	lsls r4, r5, 16
-	lsrs r4, 16
-	str r4, [sp]
-	adds r1, r4, 0
-	movs r2, 0
-	movs r3, 0
-	bl SetOamMatrix
-	mov r0, r9
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	str r4, [sp]
-	adds r1, r4, 0
-	movs r2, 0
-	movs r3, 0
-	bl SetOamMatrix
-	mov r1, r8
-	lsls r1, 24
-	lsrs r1, 24
-	mov r8, r1
-	lsls r5, 17
-	lsrs r5, 16
-	str r5, [sp]
-	mov r0, r8
-	adds r1, r4, 0
-	movs r2, 0
-	movs r3, 0
-	bl SetOamMatrix
-	ldr r0, [sp, 0x10]
-	add sp, 0x14
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0813D774: .4byte sub_813D504
-_0813D778: .4byte gSpriteTemplate_840AE20
-_0813D77C: .4byte gSprites
-_0813D780: .4byte gSprites + 0x1C
-_0813D784: .4byte sub_813D158
-	thumb_func_end sub_813D584
-
 	thumb_func_start sub_813D788
 sub_813D788: @ 813D788
 	push {r4,r5,lr}
diff --git a/include/asm.inc.h b/include/asm.inc.h
index 5ec19b81e..0e45c3174 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -446,7 +446,7 @@ void sub_813CE30(u16, u16, u16, u16);
 u8 sub_813CE88(u16, s16, u16, u16, u8);
 u8 sub_813CFA8(u16, u16, u16, u16);
 void sub_813D084(u8);
-u8 sub_813D584(/*TODO: arg types*/);
+u8 sub_813D584(u16, s16, u16, u16, u16, u8);
 void sub_813D788(struct Sprite *);
 void sub_813D880(struct Sprite *);
 void sub_813D954(/*TODO: arg types*/);
diff --git a/include/sprite.h b/include/sprite.h
index 57926fc68..3c8da394f 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -130,13 +130,13 @@ struct SpriteTemplate
 
 struct Sprite
 {
-    struct OamData oam;
-    union AnimCmd **anims;
-    struct SpriteFrameImage *images;
-    union AffineAnimCmd **affineAnims;
-    const struct SpriteTemplate *template;
-    struct SubspriteTable *subspriteTables;
-    void (*callback)(struct Sprite *);
+    /*0x00*/ struct OamData oam;
+    /*0x08*/ union AnimCmd **anims;
+    /*0x0C*/ struct SpriteFrameImage *images;
+    /*0x10*/ union AffineAnimCmd **affineAnims;
+    /*0x14*/ const struct SpriteTemplate *template;
+    /*0x18*/ struct SubspriteTable *subspriteTables;
+    /*0x1C*/ void (*callback)(struct Sprite *);
 
     /*0x20*/ struct Coords16 pos1;
     /*0x24*/ struct Coords16 pos2;
diff --git a/src/intro.c b/src/intro.c
index eead7a706..1c695c6b7 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -18,6 +18,10 @@
 #include "task.h"
 #include "trig.h"
 
+extern void *species_and_otid_get_pal(/*TODO: arg types*/);
+extern void sub_8143648(int, u8);
+extern void sub_8143680(int, u8);
+
 struct MonCoords
 {
     u8 x, y;
@@ -70,6 +74,8 @@ extern const struct SpriteSheet gIntro2LatiosSpriteSheet;
 extern const struct SpriteSheet gIntro2LatiasSpriteSheet;
 extern const struct SpritePalette gIntro2SpritePalettes[];
 
+extern const struct SpriteTemplate gSpriteTemplate_840AE20;
+
 extern const u8 gIntroCopyright_Gfx[];
 extern const u16 gIntroCopyright_Pal[];
 extern const u16 gIntroCopyright_Tilemap[];
@@ -78,6 +84,8 @@ extern const u16 gUnknown_08393E64[];
 extern union AnimCmd *gUnknown_0840B064[];
 extern void *gUnknown_0840B5A0[];
 
+extern const s16 gSineTable[];
+
 static void MainCB2_EndIntro(void);
 static void Task_IntroLoadPart1Graphics(u8);
 static void Task_IntroFadeIn(u8);
@@ -100,6 +108,11 @@ void Task_IntroPokemonBattle(u8);
 static void task_intro_19(u8);
 void task_intro_20(u8 taskId);  //should be static, but the compiler complains
 
+void sub_813D220(struct Sprite *sprite);
+void sub_813D368(struct Sprite *sprite);
+void sub_813D414(struct Sprite *sprite);
+void sub_813D484(struct Sprite *sprite);
+
 static void VBlankCB_Intro(void)
 {
     LoadOam();
@@ -1049,10 +1062,6 @@ void sub_813CE30(u16 a, u16 b, u16 c, u16 d)
     REG_BG2Y = dest.dy;
 }
 
-extern void *species_and_otid_get_pal(/*TODO: arg types*/);
-extern void sub_8143648(int, u8);
-extern void sub_8143680(int, u8);
-
 u8 sub_813CE88(u16 a, s16 b, u16 c, u16 d, u8 e)
 {
     void *pal;
@@ -1132,3 +1141,212 @@ void sub_813D0CC(struct Sprite *sprite)
         DestroySprite(sprite);
     }
 }
+
+void sub_813D158(struct Sprite *sprite)
+{
+    if (gSprites[sprite->data7].data7 != 0)
+    {
+        sprite->invisible = TRUE;
+        sprite->pos1.x += sprite->pos2.x;
+        sprite->pos1.y += sprite->pos2.y;
+        StartSpriteAnim(sprite, 3);
+        sprite->data2 = 0x400;
+        sprite->data3 = 8 * (sprite->data1 & 3);
+        sprite->callback = sub_813D0CC;
+        sprite->oam.shape = 1;
+        sprite->oam.size = 3;
+        CalcCenterToCornerVec(sprite, 1, 3, 2);
+    }
+    else
+    {
+        sprite->pos2.x = gSprites[sprite->data7].pos2.x;
+        sprite->pos2.y = gSprites[sprite->data7].pos2.y;
+        sprite->pos1.x = gSprites[sprite->data7].pos1.x;
+        sprite->pos1.y = gSprites[sprite->data7].pos1.y;
+    }
+}
+
+void sub_813D208(struct Sprite *sprite)
+{
+    if (sprite->data0 != 0)
+        sprite->callback = sub_813D220;
+}
+
+void sub_813D220(struct Sprite *sprite)
+{
+    if (sprite->pos1.x <= 116)
+    {
+        sprite->pos1.y += sprite->pos2.y;
+        sprite->pos2.y = 0;
+        sprite->pos1.x += 4;
+        sprite->pos2.x = -4;
+        sprite->data4 = 128;
+        sprite->callback = sub_813D368;
+    }
+    else
+    {
+        u16 data2;
+        u16 data3;
+        u16 data4;
+        s16 sin1;
+        s16 sin2;
+        s16 sin3;
+        s16 sin4;
+        s16 var1;
+        s16 var2;
+        s16 var3;
+        s16 var4;
+        s16 temp;
+        
+        data4 = sprite->data4;
+        sin1 = gSineTable[(u8)data4];
+        sin2 = gSineTable[(u8)(data4 + 64)];
+        sprite->data4 += 2;
+        sprite->pos2.y = sin1 / 32;
+        sprite->pos1.x--;
+        if (sprite->pos1.x & 1)
+            sprite->pos1.y++;
+        temp = -sin2 / 16;
+        data2 = sprite->data2;
+        data3 = sprite->data3;
+        sin3 = gSineTable[(u8)(temp - 16)];
+        sin4 = gSineTable[(u8)(temp + 48)];
+        var1 = sin4 * data2 / 256;
+        var2 = -sin3 * data3 / 256;
+        var3 = sin3 * data2 / 256;
+        var4 = sin4 * data3 / 256;
+        SetOamMatrix(sprite->data1, data2, 0, 0, data3);
+        SetOamMatrix(sprite->data1 + 1, var1, var3, var2, var4);
+        SetOamMatrix(sprite->data1 + 2, var1, var3, var2 * 2, var4 * 2);
+    }
+}
+
+void sub_813D368(struct Sprite *sprite)
+{
+    SetOamMatrix(sprite->data1, sprite->data6 + 64, 0, 0, sprite->data6 + 64);
+    SetOamMatrix(sprite->data1 + 1, sprite->data6 + 64, 0, 0, sprite->data6 + 64);
+    SetOamMatrix(sprite->data1 + 2, sprite->data6 + 64, 0, 0, sprite->data6 + 64);
+    if (sprite->data4 != 64)
+    {
+        u16 data4;
+        
+        sprite->data4 -= 8;
+        data4 = sprite->data4;
+        sprite->pos2.x = gSineTable[(u8)(data4 + 64)] / 64;
+        sprite->pos2.y = gSineTable[(u8)data4] / 64;
+    }
+    else
+    {
+        sprite->data4 = 0;
+        sprite->callback = sub_813D414;
+    }
+}
+
+void sub_813D414(struct Sprite *sprite)
+{
+    if (sprite->data0 != 2)
+    {
+        s16 r2;
+        
+        sprite->data4 += 8;
+        r2 = gSineTable[(u8)sprite->data4] / 16 + 64;
+        sprite->pos2.x = gSineTable[(u8)(r2 + 64)] / 64;
+        sprite->pos2.y = gSineTable[(u8)r2] / 64;
+    }
+    else
+    {
+        sprite->callback = sub_813D484;
+    }
+}
+
+void sub_813D484(struct Sprite *sprite)
+{
+    if (sprite->pos1.y < sprite->data5)
+    {
+        sprite->pos1.y += 4;
+    }
+    else
+    {
+        sprite->data7 = 1;
+        sprite->invisible = TRUE;
+        sprite->pos1.x += sprite->pos2.x;
+        sprite->pos1.y += sprite->pos2.y;
+        StartSpriteAnim(sprite, 3);
+        sprite->data2 = 0x400;
+        sprite->data3 = 8 * (sprite->data1 & 3);
+        sprite->callback = sub_813D0CC;
+        sprite->oam.shape = 1;
+        sprite->oam.size = 3;
+        CalcCenterToCornerVec(sprite, 1, 3, 2);
+    }
+}
+
+//Duplicate function
+void sub_813D504(struct Sprite *sprite)
+{
+    if (sprite->pos1.y < sprite->data5)
+    {
+        sprite->pos1.y += 4;
+    }
+    else
+    {
+        sprite->data7 = 1;
+        sprite->invisible = TRUE;
+        sprite->pos1.x += sprite->pos2.x;
+        sprite->pos1.y += sprite->pos2.y;
+        StartSpriteAnim(sprite, 3);
+        sprite->data2 = 0x400;
+        sprite->data3 = 8 * (sprite->data1 & 3);
+        sprite->callback = sub_813D0CC;
+        sprite->oam.shape = 1;
+        sprite->oam.size = 3;
+        CalcCenterToCornerVec(sprite, 1, 3, 2);
+    }
+}
+
+u8 sub_813D584(u16 a, s16 b, u16 c, u16 d, u16 e, u8 f)
+{
+    u8 spriteId;
+    u8 oldSpriteId;
+    
+    spriteId = CreateSprite(&gSpriteTemplate_840AE20, a, b, 0);
+    gSprites[spriteId].data0 = 0;
+    gSprites[spriteId].data7 = 0;
+    gSprites[spriteId].data1 = d;
+    gSprites[spriteId].data2 = c;
+    gSprites[spriteId].data3 = c;
+    gSprites[spriteId].data5 = e;
+    gSprites[spriteId].data6 = c;
+    gSprites[spriteId].oam.affineMode = 3;
+    gSprites[spriteId].oam.matrixNum = d;
+    CalcCenterToCornerVec(&gSprites[spriteId], 0, 2, 2);
+    StartSpriteAnim(&gSprites[spriteId], 2);
+    if (f == 0)
+        gSprites[spriteId].callback = sub_813D208;
+    else
+        gSprites[spriteId].callback = sub_813D504;
+    oldSpriteId = spriteId;
+    
+    spriteId = CreateSprite(&gSpriteTemplate_840AE20, a, b, 0);
+    gSprites[spriteId].data7 = oldSpriteId;
+    gSprites[spriteId].data1 = d + 1;
+    gSprites[spriteId].oam.affineMode = 3;
+    gSprites[spriteId].oam.matrixNum = d + 1;
+    CalcCenterToCornerVec(&gSprites[spriteId], 0, 2, 2);
+    gSprites[spriteId].callback = sub_813D158;
+    
+    spriteId = CreateSprite(&gSpriteTemplate_840AE20, a, b, 0);
+    gSprites[spriteId].data7 = oldSpriteId;
+    gSprites[spriteId].data1 = d + 2;
+    StartSpriteAnim(&gSprites[spriteId], 1);
+    gSprites[spriteId].oam.affineMode = 3;
+    gSprites[spriteId].oam.matrixNum = d + 2;
+    CalcCenterToCornerVec(&gSprites[spriteId], 0, 2, 2);
+    gSprites[spriteId].callback = sub_813D158;
+    
+    SetOamMatrix(d, c + 32, 0, 0, c + 32);
+    SetOamMatrix(d + 1, c + 32, 0, 0, c + 32);
+    SetOamMatrix(d + 2, c + 32, 0, 0, 2 * (c + 32));
+    
+    return oldSpriteId;
+}