begin decompiling more intro code

5 files changed, 458 insertions, 752 deletions

diff --git a/asm/intro.s b/asm/intro.s
index ee91e7660..619ddc285 100644
--- a/asm/intro.s
+++ b/asm/intro.s
@@ -6,752 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_813CAF4
-sub_813CAF4: @ 813CAF4
-	push {r4-r6,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, _0813CB2C @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x26]
-	adds r0, 0x1
-	movs r6, 0
-	strh r0, [r4, 0x26]
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x4
-	bne _0813CB18
-	b _0813CC28
-_0813CB18:
-	cmp r0, 0x4
-	bgt _0813CB30
-	cmp r0, 0x2
-	beq _0813CB60
-	cmp r0, 0x2
-	bgt _0813CBC4
-	cmp r0, 0
-	beq _0813CB46
-	b _0813CC8E
-	.align 2, 0
-_0813CB2C: .4byte gTasks
-_0813CB30:
-	cmp r0, 0x1E
-	beq _0813CBEE
-	cmp r0, 0x1E
-	bgt _0813CB3E
-	cmp r0, 0x14
-	beq _0813CB8A
-	b _0813CC8E
-_0813CB3E:
-	cmp r0, 0x28
-	bne _0813CB44
-	b _0813CC56
-_0813CB44:
-	b _0813CC8E
-_0813CB46:
-	movs r1, 0x80
-	lsls r1, 19
-	movs r2, 0xE5
-	lsls r2, 6
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r0, _0813CB5C @ =REG_BG2CNT
-	strh r6, [r0]
-	movs r0, 0xFF
-	strh r0, [r4, 0x8]
-	b _0813CC8E
-	.align 2, 0
-_0813CB5C: .4byte REG_BG2CNT
-_0813CB60:
-	ldr r0, _0813CBB0 @ =0x0000ffff
-	str r0, [sp]
-	movs r0, 0x1
-	movs r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	ldr r1, _0813CBB4 @ =REG_BG2CNT
-	ldr r2, _0813CBB8 @ =0x00000e07
-	adds r0, r2, 0
-	strh r0, [r1]
-	subs r1, 0xC
-	movs r2, 0xF5
-	lsls r2, 6
-	adds r0, r2, 0
-	strh r0, [r1]
-	strh r6, [r4, 0xA]
-	strh r6, [r4, 0xC]
-	movs r0, 0x14
-	strh r0, [r4, 0x8]
-_0813CB8A:
-	ldr r2, _0813CBBC @ =REG_BG2VOFS
-	ldr r0, _0813CBC0 @ =gTasks
-	lsls r1, r5, 2
-	adds r1, r5
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0xA]
-	strh r0, [r2]
-	subs r2, 0x2
-	ldrh r0, [r1, 0xC]
-	strh r0, [r2]
-	ldrh r0, [r1, 0xA]
-	adds r0, 0x6
-	strh r0, [r1, 0xA]
-	ldrh r0, [r1, 0xC]
-	subs r0, 0x8
-	strh r0, [r1, 0xC]
-	b _0813CC8E
-	.align 2, 0
-_0813CBB0: .4byte 0x0000ffff
-_0813CBB4: .4byte REG_BG2CNT
-_0813CBB8: .4byte 0x00000e07
-_0813CBBC: .4byte REG_BG2VOFS
-_0813CBC0: .4byte gTasks
-_0813CBC4:
-	ldr r0, _0813CC14 @ =0x0000ffff
-	str r0, [sp]
-	movs r0, 0x1
-	movs r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	ldr r1, _0813CC18 @ =REG_BG2CNT
-	ldr r2, _0813CC1C @ =0x00000e07
-	adds r0, r2, 0
-	strh r0, [r1]
-	subs r1, 0xC
-	movs r2, 0xF5
-	lsls r2, 6
-	adds r0, r2, 0
-	strh r0, [r1]
-	strh r6, [r4, 0xA]
-	strh r6, [r4, 0xC]
-	movs r0, 0x1E
-	strh r0, [r4, 0x8]
-_0813CBEE:
-	ldr r2, _0813CC20 @ =REG_BG2VOFS
-	ldr r0, _0813CC24 @ =gTasks
-	lsls r1, r5, 2
-	adds r1, r5
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0xA]
-	strh r0, [r2]
-	subs r2, 0x2
-	ldrh r0, [r1, 0xC]
-	strh r0, [r2]
-	ldrh r0, [r1, 0xA]
-	subs r0, 0x6
-	strh r0, [r1, 0xA]
-	ldrh r0, [r1, 0xC]
-	adds r0, 0x8
-	strh r0, [r1, 0xC]
-	b _0813CC8E
-	.align 2, 0
-_0813CC14: .4byte 0x0000ffff
-_0813CC18: .4byte REG_BG2CNT
-_0813CC1C: .4byte 0x00000e07
-_0813CC20: .4byte REG_BG2VOFS
-_0813CC24: .4byte gTasks
-_0813CC28:
-	ldr r0, _0813CC98 @ =0x000037f7
-	str r0, [sp]
-	movs r0, 0x1
-	movs r1, 0x5
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r1, _0813CC9C @ =REG_BG2CNT
-	ldr r2, _0813CCA0 @ =0x00000e07
-	adds r0, r2, 0
-	strh r0, [r1]
-	subs r1, 0xC
-	movs r2, 0xF5
-	lsls r2, 6
-	adds r0, r2, 0
-	strh r0, [r1]
-	strh r6, [r4, 0xA]
-	strh r6, [r4, 0xC]
-	movs r0, 0x8
-	strh r0, [r4, 0xE]
-	movs r0, 0x28
-	strh r0, [r4, 0x8]
-_0813CC56:
-	ldr r2, _0813CCA4 @ =REG_BG2VOFS
-	ldr r1, _0813CCA8 @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r3, r0, r1
-	ldrh r0, [r3, 0xA]
-	strh r0, [r2]
-	ldr r1, _0813CCAC @ =REG_BG2HOFS
-	ldrh r0, [r3, 0xC]
-	strh r0, [r1]
-	ldrh r0, [r3, 0xA]
-	ldrh r2, [r3, 0xE]
-	subs r0, r2
-	strh r0, [r3, 0xA]
-	ldrh r1, [r3, 0xC]
-	adds r0, r2, r1
-	strh r0, [r3, 0xC]
-	ldrh r1, [r3, 0x26]
-	movs r0, 0x7
-	ands r0, r1
-	cmp r0, 0
-	bne _0813CC8E
-	lsls r0, r2, 16
-	cmp r0, 0
-	beq _0813CC8E
-	subs r0, r2, 0x1
-	strh r0, [r3, 0xE]
-_0813CC8E:
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813CC98: .4byte 0x000037f7
-_0813CC9C: .4byte REG_BG2CNT
-_0813CCA0: .4byte 0x00000e07
-_0813CCA4: .4byte REG_BG2VOFS
-_0813CCA8: .4byte gTasks
-_0813CCAC: .4byte REG_BG2HOFS
-	thumb_func_end sub_813CAF4
-
-	thumb_func_start intro_reset_and_hide_bgs
-intro_reset_and_hide_bgs: @ 813CCB0
-	movs r0, 0x80
-	lsls r0, 19
-	movs r1, 0
-	strh r1, [r0]
-	adds r0, 0x1C
-	strh r1, [r0]
-	adds r0, 0x2
-	strh r1, [r0]
-	subs r0, 0x6
-	strh r1, [r0]
-	adds r0, 0x2
-	strh r1, [r0]
-	subs r0, 0x6
-	strh r1, [r0]
-	adds r0, 0x2
-	strh r1, [r0]
-	subs r0, 0x6
-	strh r1, [r0]
-	adds r0, 0x2
-	strh r1, [r0]
-	adds r0, 0x3E
-	strh r1, [r0]
-	adds r0, 0x2
-	strh r1, [r0]
-	adds r0, 0x2
-	strh r1, [r0]
-	bx lr
-	thumb_func_end intro_reset_and_hide_bgs
-
-	thumb_func_start sub_813CCE8
-sub_813CCE8: @ 813CCE8
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r1, _0813CD0C @ =gTasks
-	lsls r0, r3, 2
-	adds r0, r3
-	lsls r0, 3
-	adds r0, r1
-	movs r2, 0x8
-	ldrsh r0, [r0, r2]
-	adds r2, r1, 0
-	cmp r0, 0x4
-	bhi _0813CD28
-	lsls r0, 2
-	ldr r1, _0813CD10 @ =_0813CD14
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0813CD0C: .4byte gTasks
-_0813CD10: .4byte _0813CD14
-	.align 2, 0
-_0813CD14:
-	.4byte _0813CD28
-	.4byte _0813CD5C
-	.4byte _0813CD8C
-	.4byte _0813CDA8
-	.4byte _0813CDFC
-_0813CD28:
-	ldr r1, _0813CD54 @ =REG_BLDCNT
-	ldr r4, _0813CD58 @ =0x00003f50
-	adds r0, r4, 0
-	strh r0, [r1]
-	adds r1, 0x2
-	movs r4, 0x80
-	lsls r4, 5
-	adds r0, r4, 0
-	strh r0, [r1]
-	adds r1, 0x2
-	movs r0, 0
-	strh r0, [r1]
-	lsls r0, r3, 2
-	adds r0, r3
-	lsls r0, 3
-	adds r0, r2
-	movs r1, 0x40
-	strh r1, [r0, 0xA]
-	movs r1, 0x1
-	strh r1, [r0, 0x8]
-	b _0813CE26
-	.align 2, 0
-_0813CD54: .4byte REG_BLDCNT
-_0813CD58: .4byte 0x00003f50
-_0813CD5C:
-	lsls r0, r3, 2
-	adds r0, r3
-	lsls r0, 3
-	adds r2, r0, r2
-	ldrh r1, [r2, 0xA]
-	movs r3, 0xA
-	ldrsh r0, [r2, r3]
-	cmp r0, 0
-	beq _0813CD78
-	subs r0, r1, 0x1
-	strh r0, [r2, 0xA]
-	movs r4, 0xA
-	ldrsh r0, [r2, r4]
-	b _0813CDC2
-_0813CD78:
-	ldr r1, _0813CD84 @ =REG_BLDALPHA
-	ldr r0, _0813CD88 @ =gUnknown_08393E64
-	ldrh r0, [r0]
-	strh r0, [r1]
-	movs r0, 0x80
-	b _0813CDEA
-	.align 2, 0
-_0813CD84: .4byte REG_BLDALPHA
-_0813CD88: .4byte gUnknown_08393E64
-_0813CD8C:
-	lsls r0, r3, 2
-	adds r0, r3
-	lsls r0, 3
-	adds r1, r0, r2
-	ldrh r0, [r1, 0xA]
-	movs r3, 0xA
-	ldrsh r2, [r1, r3]
-	cmp r2, 0
-	bne _0813CE0E
-	strh r2, [r1, 0xA]
-	ldrh r0, [r1, 0x8]
-	adds r0, 0x1
-	strh r0, [r1, 0x8]
-	b _0813CE26
-_0813CDA8:
-	lsls r0, r3, 2
-	adds r0, r3
-	lsls r0, 3
-	adds r2, r0, r2
-	ldrh r1, [r2, 0xA]
-	movs r4, 0xA
-	ldrsh r0, [r2, r4]
-	cmp r0, 0x3D
-	bgt _0813CDE0
-	adds r0, r1, 0x1
-	strh r0, [r2, 0xA]
-	movs r1, 0xA
-	ldrsh r0, [r2, r1]
-_0813CDC2:
-	lsrs r1, r0, 31
-	adds r0, r1
-	movs r2, 0xFF
-	lsls r2, 1
-	ldr r3, _0813CDD8 @ =REG_BLDALPHA
-	ldr r1, _0813CDDC @ =gUnknown_08393E64
-	ands r0, r2
-	adds r0, r1
-	ldrh r0, [r0]
-	strh r0, [r3]
-	b _0813CE26
-	.align 2, 0
-_0813CDD8: .4byte REG_BLDALPHA
-_0813CDDC: .4byte gUnknown_08393E64
-_0813CDE0:
-	ldr r1, _0813CDF4 @ =REG_BLDALPHA
-	ldr r0, _0813CDF8 @ =gUnknown_08393E64
-	ldrh r0, [r0, 0x3E]
-	strh r0, [r1]
-	movs r0, 0x10
-_0813CDEA:
-	strh r0, [r2, 0xA]
-	ldrh r0, [r2, 0x8]
-	adds r0, 0x1
-	strh r0, [r2, 0x8]
-	b _0813CE26
-	.align 2, 0
-_0813CDF4: .4byte REG_BLDALPHA
-_0813CDF8: .4byte gUnknown_08393E64
-_0813CDFC:
-	lsls r0, r3, 2
-	adds r0, r3
-	lsls r0, 3
-	adds r1, r0, r2
-	ldrh r0, [r1, 0xA]
-	movs r4, 0xA
-	ldrsh r2, [r1, r4]
-	cmp r2, 0
-	beq _0813CE14
-_0813CE0E:
-	subs r0, 0x1
-	strh r0, [r1, 0xA]
-	b _0813CE26
-_0813CE14:
-	ldr r0, _0813CE2C @ =REG_BLDCNT
-	strh r2, [r0]
-	adds r0, 0x2
-	strh r2, [r0]
-	adds r0, 0x2
-	strh r2, [r0]
-	adds r0, r3, 0
-	bl DestroyTask
-_0813CE26:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813CE2C: .4byte REG_BLDCNT
-	thumb_func_end sub_813CCE8
-
-	thumb_func_start sub_813CE30
-sub_813CE30: @ 813CE30
-	push {r4,lr}
-	sub sp, 0x24
-	lsls r2, 16
-	lsrs r2, 16
-	movs r4, 0x80
-	lsls r4, 8
-	str r4, [sp]
-	str r4, [sp, 0x4]
-	mov r4, sp
-	strh r0, [r4, 0x8]
-	mov r0, sp
-	strh r1, [r0, 0xA]
-	strh r2, [r0, 0xC]
-	strh r2, [r0, 0xE]
-	strh r3, [r0, 0x10]
-	add r4, sp, 0x14
-	adds r1, r4, 0
-	movs r2, 0x1
-	bl BgAffineSet
-	ldr r1, _0813CE84 @ =REG_BG2PA
-	ldrh r0, [r4]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldrh r0, [r4, 0x2]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldrh r0, [r4, 0x4]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldrh r0, [r4, 0x6]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r0, [r4, 0x8]
-	str r0, [r1]
-	adds r1, 0x4
-	ldr r0, [r4, 0xC]
-	str r0, [r1]
-	add sp, 0x24
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813CE84: .4byte REG_BG2PA
-	thumb_func_end sub_813CE30
-
-	thumb_func_start sub_813CE88
-sub_813CE88: @ 813CE88
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x10
-	ldr r4, [sp, 0x30]
-	lsls r0, 16
-	lsrs r7, r0, 16
-	lsls r1, 16
-	lsrs r1, 16
-	mov r9, r1
-	lsls r2, 16
-	lsrs r2, 16
-	mov r10, r2
-	lsls r3, 16
-	lsrs r3, 16
-	mov r8, r3
-	lsls r4, 24
-	lsrs r6, r4, 24
-	cmp r6, 0
-	beq _0813CEF0
-	lsls r0, r7, 3
-	ldr r1, _0813CEE4 @ =gMonFrontPicTable
-	adds r0, r1
-	ldr r1, _0813CEE8 @ =gMonFrontPicCoords
-	lsls r2, r7, 2
-	adds r2, r1
-	ldrb r1, [r2]
-	ldrb r2, [r2, 0x1]
-	movs r3, 0x80
-	lsls r3, 18
-	ldr r5, _0813CEEC @ =gUnknown_0840B5A0
-	mov r6, r8
-	lsls r4, r6, 2
-	adds r4, r5
-	ldr r4, [r4]
-	str r4, [sp]
-	str r7, [sp, 0x4]
-	movs r4, 0
-	str r4, [sp, 0x8]
-	movs r4, 0x1
-	str r4, [sp, 0xC]
-	bl LoadSpecialPokePic
-	b _0813CF1C
-	.align 2, 0
-_0813CEE4: .4byte gMonFrontPicTable
-_0813CEE8: .4byte gMonFrontPicCoords
-_0813CEEC: .4byte gUnknown_0840B5A0
-_0813CEF0:
-	lsls r0, r7, 3
-	ldr r1, _0813CF90 @ =gMonBackPicTable
-	adds r0, r1
-	ldr r1, _0813CF94 @ =gMonBackPicCoords
-	lsls r2, r7, 2
-	adds r2, r1
-	ldrb r1, [r2]
-	ldrb r2, [r2, 0x1]
-	movs r3, 0x80
-	lsls r3, 18
-	ldr r4, _0813CF98 @ =gUnknown_0840B5A0
-	mov r12, r4
-	mov r5, r8
-	lsls r4, r5, 2
-	add r4, r12
-	ldr r4, [r4]
-	str r4, [sp]
-	str r7, [sp, 0x4]
-	str r6, [sp, 0x8]
-	str r6, [sp, 0xC]
-	bl LoadSpecialPokePic
-_0813CF1C:
-	ldr r2, _0813CF9C @ =0x0000ffff
-	adds r0, r7, 0
-	movs r1, 0
-	bl species_and_otid_get_pal
-	mov r6, r8
-	lsls r4, r6, 4
-	movs r2, 0x80
-	lsls r2, 1
-	adds r1, r4, r2
-	lsls r1, 16
-	lsrs r1, 16
-	movs r2, 0x20
-	bl LoadCompressedPalette
-	lsls r1, r6, 24
-	lsrs r1, 24
-	mov r0, r8
-	bl sub_8143648
-	ldr r0, _0813CFA0 @ =gUnknown_02024E8C
-	mov r3, r9
-	lsls r1, r3, 16
-	asrs r1, 16
-	mov r5, r10
-	lsls r2, r5, 16
-	asrs r2, 16
-	mov r3, r8
-	adds r3, 0x1
-	lsls r3, 26
-	lsrs r3, 24
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _0813CFA4 @ =gSprites
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	adds r2, r1
-	ldrb r3, [r2, 0x5]
-	movs r1, 0xF
-	ands r1, r3
-	orrs r1, r4
-	movs r3, 0xD
-	negs r3, r3
-	ands r1, r3
-	movs r3, 0x4
-	orrs r1, r3
-	strb r1, [r2, 0x5]
-	add sp, 0x10
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0813CF90: .4byte gMonBackPicTable
-_0813CF94: .4byte gMonBackPicCoords
-_0813CF98: .4byte gUnknown_0840B5A0
-_0813CF9C: .4byte 0x0000ffff
-_0813CFA0: .4byte gUnknown_02024E8C
-_0813CFA4: .4byte gSprites
-	thumb_func_end sub_813CE88
-
-	thumb_func_start sub_813CFA8
-sub_813CFA8: @ 813CFA8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	mov r9, r1
-	mov r10, r2
-	adds r6, r3, 0
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r1, 16
-	lsrs r1, 16
-	mov r9, r1
-	lsls r2, 16
-	lsrs r2, 16
-	mov r10, r2
-	lsls r6, 16
-	lsrs r6, 16
-	lsls r7, r0, 3
-	ldr r1, _0813D068 @ =gTrainerBackPicTable
-	mov r8, r1
-	add r8, r7
-	ldr r1, _0813D06C @ =gTrainerBackPicCoords
-	lsls r2, r0, 2
-	adds r2, r1
-	ldrb r1, [r2]
-	ldrb r2, [r2, 0x1]
-	movs r3, 0x80
-	lsls r3, 18
-	ldr r5, _0813D070 @ =gUnknown_0840B5A0
-	lsls r4, r6, 2
-	adds r4, r5
-	ldr r4, [r4]
-	str r4, [sp]
-	str r0, [sp, 0x4]
-	mov r0, r8
-	bl DecompressPicFromTable_2
-	ldr r0, _0813D074 @ =gTrainerBackPicPaletteTable
-	adds r0, r7, r0
-	ldr r0, [r0]
-	lsls r4, r6, 4
-	movs r2, 0x80
-	lsls r2, 1
-	adds r1, r4, r2
-	lsls r1, 16
-	lsrs r1, 16
-	movs r2, 0x20
-	bl LoadCompressedPalette
-	lsls r1, r6, 24
-	lsrs r1, 24
-	adds r0, r6, 0
-	bl sub_8143680
-	ldr r0, _0813D078 @ =gUnknown_02024E8C
-	ldr r1, _0813D07C @ =gUnknown_0840B064
-	str r1, [r0, 0x8]
-	mov r1, r9
-	lsls r1, 16
-	asrs r1, 16
-	mov r9, r1
-	mov r2, r10
-	lsls r2, 16
-	asrs r2, 16
-	mov r10, r2
-	movs r3, 0x1
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _0813D080 @ =gSprites
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	adds r2, r1
-	ldrb r3, [r2, 0x5]
-	movs r1, 0xF
-	ands r1, r3
-	orrs r1, r4
-	movs r3, 0xD
-	negs r3, r3
-	ands r1, r3
-	movs r3, 0x4
-	orrs r1, r3
-	strb r1, [r2, 0x5]
-	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
-_0813D068: .4byte gTrainerBackPicTable
-_0813D06C: .4byte gTrainerBackPicCoords
-_0813D070: .4byte gUnknown_0840B5A0
-_0813D074: .4byte gTrainerBackPicPaletteTable
-_0813D078: .4byte gUnknown_02024E8C
-_0813D07C: .4byte gUnknown_0840B064
-_0813D080: .4byte gSprites
-	thumb_func_end sub_813CFA8
-
-	thumb_func_start sub_813D084
-sub_813D084: @ 813D084
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0813D0A0
-	cmp r0, 0x1
-	ble _0813D096
-	cmp r0, 0x2
-	beq _0813D0A8
-_0813D096:
-	ldr r2, _0813D09C @ =0x00003ff6
-	b _0813D0AA
-	.align 2, 0
-_0813D09C: .4byte 0x00003ff6
-_0813D0A0:
-	ldr r2, _0813D0A4 @ =0x000031df
-	b _0813D0AA
-	.align 2, 0
-_0813D0A4: .4byte 0x000031df
-_0813D0A8:
-	ldr r2, _0813D0C0 @ =0x0000518c
-_0813D0AA:
-	ldr r0, _0813D0C4 @ =gPlttBufferUnfaded
-	movs r1, 0xF1
-	lsls r1, 1
-	adds r0, r1
-	strh r2, [r0]
-	ldr r0, _0813D0C8 @ =gPlttBufferFaded
-	adds r0, r1
-	strh r2, [r0]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813D0C0: .4byte 0x0000518c
-_0813D0C4: .4byte gPlttBufferUnfaded
-_0813D0C8: .4byte gPlttBufferFaded
-	thumb_func_end sub_813D084
-
 	thumb_func_start sub_813D0CC
 sub_813D0CC: @ 813D0CC
 	push {r4,lr}
diff --git a/include/asm.inc.h b/include/asm.inc.h
index 5e2b49a84..5ec19b81e 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -443,9 +443,9 @@ void sub_813CAF4(u8);
 void intro_reset_and_hide_bgs(void);
 void sub_813CCE8(u8);
 void sub_813CE30(u16, u16, u16, u16);
-u8 sub_813CE88(/*TODO: arg types*/);
-u8 sub_813CFA8(/*TODO: arg types*/);
-void sub_813D084(/*TODO: arg types*/);
+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*/);
 void sub_813D788(struct Sprite *);
 void sub_813D880(struct Sprite *);
diff --git a/include/gba/syscall.h b/include/gba/syscall.h
index 9576f7e99..e47f964d1 100644
--- a/include/gba/syscall.h
+++ b/include/gba/syscall.h
@@ -31,6 +31,8 @@ void CpuSet(const void *src, void *dest, u32 control);
 
 void CpuFastSet(const void *src, void *dest, u32 control);
 
+void BgAffineSet(struct BgAffineSrcData *src, struct BgAffineDstData *dest, s32 count);
+
 void ObjAffineSet(struct ObjAffineSrcData *src, void *dest, s32 count, s32 offset);
 
 void LZ77UnCompWram(const void *src, void *dest);
diff --git a/include/gba/types.h b/include/gba/types.h
index be7390d5a..fd8a20a4c 100644
--- a/include/gba/types.h
+++ b/include/gba/types.h
@@ -74,6 +74,27 @@ struct OamData
 #define ST_OAM_H_RECTANGLE 1
 #define ST_OAM_V_RECTANGLE 2
 
+struct BgAffineSrcData
+{
+    s32 texX;
+    s32 texY;
+    s16 scrX;
+    s16 scrY;
+    s16 sx;
+    s16 sy;
+    u16 alpha;
+};
+
+struct BgAffineDstData
+{
+    s16 pa;
+    s16 pb;
+    s16 pc;
+    s16 pd;
+    s32 dx;
+    s32 dy;
+};
+
 struct ObjAffineSrcData
 {
     s16 xScale;
diff --git a/src/intro.c b/src/intro.c
index b9fdb169d..d2224fca9 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -18,6 +18,12 @@
 #include "task.h"
 #include "trig.h"
 
+struct MonCoords
+{
+    u8 x, y;
+};
+
+extern struct SpriteTemplate gUnknown_02024E8C;
 extern u16 gUnknown_02039318;
 extern u16 gUnknown_0203931A;
 extern u16 gUnknown_02039358;
@@ -27,6 +33,13 @@ extern u32 gIntroFrameCounter;
 extern struct GcmbStruct gUnknown_03005EE0;
 extern u16 gSaveFileStatus;
 extern u8 gReservedSpritePaletteCount;
+extern struct SpriteSheet gMonFrontPicTable[];
+extern struct MonCoords gMonFrontPicCoords[];
+extern struct SpriteSheet gMonBackPicTable[];
+extern struct MonCoords gMonBackPicCoords[];
+extern struct SpriteSheet gTrainerBackPicTable[];
+extern struct MonCoords gTrainerBackPicCoords[];
+extern struct SpritePalette gTrainerBackPicPaletteTable[];
 
 extern const u16 gIntro1BGPals[];
 extern const u8 gIntro1BG0_Tilemap[];
@@ -61,6 +74,10 @@ extern const u8 gIntroCopyright_Gfx[];
 extern const u16 gIntroCopyright_Pal[];
 extern const u16 gIntroCopyright_Tilemap[];
 
+extern const u16 gUnknown_08393E64[];
+extern union AnimCmd *gUnknown_0840B064[];
+extern void *gUnknown_0840B5A0[];
+
 static void MainCB2_EndIntro(void);
 static void Task_IntroLoadPart1Graphics(u8);
 static void Task_IntroFadeIn(u8);
@@ -79,8 +96,9 @@ static void task_intro_14(u8);
 static void task_intro_15(u8);
 static void task_intro_16(u8);
 static void task_intro_17(u8);
-static void Task_IntroPokemonBattle(u8);
+void Task_IntroPokemonBattle(u8);
 static void task_intro_19(u8);
+void task_intro_20(u8 taskId);  //should be static, but the compiler complains
 
 static void VBlankCB_Intro(void)
 {
@@ -527,7 +545,7 @@ static void task_intro_14(u8 taskId)
     REG_BG3CNT = 0x603;
     REG_BG0CNT = 0x700;
     REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON;
-    gTasks[taskId].data[15] = CreateTask(sub_813CAF4, 0);
+    gTasks[taskId].data[15] = CreateTask(task_intro_20, 0);
     gTasks[gTasks[taskId].data[15]].data[0] = 0;
     gTasks[taskId].data[0] = 0;
     gTasks[taskId].func = task_intro_15;
@@ -562,7 +580,7 @@ static void task_intro_17(u8 taskId)
     gTasks[taskId].func = Task_IntroPokemonBattle;
 }
 
-static void Task_IntroPokemonBattle(u8 taskId)
+void Task_IntroPokemonBattle(u8 taskId)
 {
     u8 spriteId;
     
@@ -676,3 +694,414 @@ static void task_intro_19(u8 taskId)
     DestroyTask(taskId);
     SetMainCallback2(MainCB2_EndIntro);
 }
+
+void task_intro_20(u8 taskId)
+{
+    gTasks[taskId].data[15]++;
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        REG_DISPCNT = 0x3940;
+        REG_BG2CNT = 0;
+        gTasks[taskId].data[0] = 0xFF;
+        break;
+    case 2:
+        BeginNormalPaletteFade(1, 0, 0x10, 0, 0xFFFF);
+        REG_BG2CNT = 0x0E07;
+        REG_DISPCNT = 0x3D40;
+        gTasks[taskId].data[1] = 0;
+        gTasks[taskId].data[2] = 0;
+        gTasks[taskId].data[0] = 20;
+        //fall through
+    case 20:
+        REG_BG2VOFS = gTasks[taskId].data[1];
+        REG_BG2HOFS = gTasks[taskId].data[2];
+        gTasks[taskId].data[1] += 6;
+        gTasks[taskId].data[2] -= 8;
+        break;
+    case 3:
+        BeginNormalPaletteFade(1, 0, 0x10, 0, 0xFFFF);
+        REG_BG2CNT = 0x0E07;
+        REG_DISPCNT = 0x3D40;
+        gTasks[taskId].data[1] = 0;
+        gTasks[taskId].data[2] = 0;
+        gTasks[taskId].data[0] = 0x1E;
+        //fall through
+    case 0x1E:
+        REG_BG2VOFS = gTasks[taskId].data[1];
+        REG_BG2HOFS = gTasks[taskId].data[2];
+        gTasks[taskId].data[1] -= 6;
+        gTasks[taskId].data[2] += 8;
+        break;
+    case 4:
+        BeginNormalPaletteFade(1, 5, 0, 0x10, 0x37F7);
+        REG_BG2CNT = 0x0E07;
+        REG_DISPCNT = 0x3D40;
+        gTasks[taskId].data[1] = 0;
+        gTasks[taskId].data[2] = 0;
+        gTasks[taskId].data[3] = 8;
+        gTasks[taskId].data[0] = 0x28;
+        //fall through
+    case 0x28:
+        REG_BG2VOFS = gTasks[taskId].data[1];
+        REG_BG2HOFS = gTasks[taskId].data[2];
+        gTasks[taskId].data[1] -= gTasks[taskId].data[3];
+        gTasks[taskId].data[2] += gTasks[taskId].data[3];
+        if (!(gTasks[taskId].data[15] & 7) && gTasks[taskId].data[3] != 0)
+            gTasks[taskId].data[3]--;
+        break;
+    case 0xFF:  //needed to prevent jump table optimization
+        break;
+    }
+}
+
+void intro_reset_and_hide_bgs(void)
+{
+    REG_DISPCNT = 0;
+    REG_BG3HOFS = 0;
+    REG_BG3VOFS = 0;
+    REG_BG2HOFS = 0;
+    REG_BG2VOFS = 0;
+    REG_BG1HOFS = 0;
+    REG_BG1VOFS = 0;
+    REG_BG0HOFS = 0;
+    REG_BG0VOFS = 0;
+    REG_BLDCNT = 0;
+    REG_BLDALPHA = 0;
+    REG_BLDY = 0;
+}
+
+#ifdef NONMATCHING
+void sub_813CCE8(u8 taskId)
+{
+    switch (gTasks[taskId].data[0])
+    {
+    default:
+    case 0:
+        REG_BLDCNT = 0x3F50;
+        REG_BLDALPHA = 0x1000;
+        REG_BLDY = 0;
+        gTasks[taskId].data[1] = 0x40;
+        gTasks[taskId].data[0] = 1;
+        return;
+    case 1:
+        if (gTasks[taskId].data[1] != 0)
+        {
+            u32 foo;
+            u32 bar asm("r2");
+            
+            gTasks[taskId].data[1]--;
+            //tail merge at _0813CDC2
+            foo = gTasks[taskId].data[1] + (gTasks[taskId].data[1] < 0);
+            bar = 0x1FE;
+            REG_BLDALPHA = gUnknown_08393E64[(foo & bar) / 2];
+        }
+        else
+        {
+            REG_BLDALPHA = gUnknown_08393E64[0];
+            gTasks[taskId].data[1] = 0x80;
+            gTasks[taskId].data[0]++;
+        }
+        return;
+    case 2:
+        if (gTasks[taskId].data[1] != 0)
+        {
+            //tail merge at _0813CE0E
+            gTasks[taskId].data[1]--;
+        }
+        else
+        {
+            gTasks[taskId].data[1] = 0;  //redundant?
+            gTasks[taskId].data[0]++;
+        }
+        return;
+    case 3:
+        if (gTasks[taskId].data[1] <= 0x3D)
+        {
+            u32 foo;
+            u32 bar asm("r2");
+            
+            gTasks[taskId].data[1]++;
+            //_0813CDC2
+            foo = gTasks[taskId].data[1] + (gTasks[taskId].data[1] < 0);
+            bar = 0x1FE;
+            REG_BLDALPHA = gUnknown_08393E64[(foo & bar) / 2];
+        }
+        else
+        {
+            //_0813CDE0
+            REG_BLDALPHA = gUnknown_08393E64[0x1F];
+            gTasks[taskId].data[1] = 0x10;
+            gTasks[taskId].data[0]++;
+        }
+        return;
+    case 4:
+        if (gTasks[taskId].data[1] != 0)
+        {
+            gTasks[taskId].data[1]--;
+        }
+        else
+        {
+            REG_BLDCNT = 0;
+            REG_BLDALPHA = 0;
+            REG_BLDY = 0;
+            DestroyTask(taskId);
+        }
+        return;
+    }
+}
+#else
+__attribute__((naked))
+void sub_813CCE8(u8 taskId)
+{
+    asm("\n\
+    .equ REG_BLDCNT, 0x4000050\n\
+    .equ REG_BLDALPHA, 0x4000052\n\
+    .syntax unified\n\
+    push {r4,lr}\n\
+    lsls r0, 24\n\
+    lsrs r3, r0, 24\n\
+    ldr r1, _0813CD0C @ =gTasks\n\
+    lsls r0, r3, 2\n\
+    adds r0, r3\n\
+    lsls r0, 3\n\
+    adds r0, r1\n\
+    movs r2, 0x8\n\
+    ldrsh r0, [r0, r2]\n\
+    adds r2, r1, 0\n\
+    cmp r0, 0x4\n\
+    bhi _0813CD28\n\
+    lsls r0, 2\n\
+    ldr r1, _0813CD10 @ =_0813CD14\n\
+    adds r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .align 2, 0\n\
+_0813CD0C: .4byte gTasks\n\
+_0813CD10: .4byte _0813CD14\n\
+    .align 2, 0\n\
+_0813CD14:\n\
+    .4byte _0813CD28\n\
+    .4byte _0813CD5C\n\
+    .4byte _0813CD8C\n\
+    .4byte _0813CDA8\n\
+    .4byte _0813CDFC\n\
+_0813CD28:\n\
+    ldr r1, _0813CD54 @ =REG_BLDCNT\n\
+    ldr r4, _0813CD58 @ =0x00003f50\n\
+    adds r0, r4, 0\n\
+    strh r0, [r1]\n\
+    adds r1, 0x2\n\
+    movs r4, 0x80\n\
+    lsls r4, 5\n\
+    adds r0, r4, 0\n\
+    strh r0, [r1]\n\
+    adds r1, 0x2\n\
+    movs r0, 0\n\
+    strh r0, [r1]\n\
+    lsls r0, r3, 2\n\
+    adds r0, r3\n\
+    lsls r0, 3\n\
+    adds r0, r2\n\
+    movs r1, 0x40\n\
+    strh r1, [r0, 0xA]\n\
+    movs r1, 0x1\n\
+    strh r1, [r0, 0x8]\n\
+    b _0813CE26\n\
+    .align 2, 0\n\
+_0813CD54: .4byte REG_BLDCNT\n\
+_0813CD58: .4byte 0x00003f50\n\
+_0813CD5C:\n\
+    lsls r0, r3, 2\n\
+    adds r0, r3\n\
+    lsls r0, 3\n\
+    adds r2, r0, r2\n\
+    ldrh r1, [r2, 0xA]\n\
+    movs r3, 0xA\n\
+    ldrsh r0, [r2, r3]\n\
+    cmp r0, 0\n\
+    beq _0813CD78\n\
+    subs r0, r1, 0x1\n\
+    strh r0, [r2, 0xA]\n\
+    movs r4, 0xA\n\
+    ldrsh r0, [r2, r4]\n\
+    b _0813CDC2\n\
+_0813CD78:\n\
+    ldr r1, _0813CD84 @ =REG_BLDALPHA\n\
+    ldr r0, _0813CD88 @ =gUnknown_08393E64\n\
+    ldrh r0, [r0]\n\
+    strh r0, [r1]\n\
+    movs r0, 0x80\n\
+    b _0813CDEA\n\
+    .align 2, 0\n\
+_0813CD84: .4byte REG_BLDALPHA\n\
+_0813CD88: .4byte gUnknown_08393E64\n\
+_0813CD8C:\n\
+    lsls r0, r3, 2\n\
+    adds r0, r3\n\
+    lsls r0, 3\n\
+    adds r1, r0, r2\n\
+    ldrh r0, [r1, 0xA]\n\
+    movs r3, 0xA\n\
+    ldrsh r2, [r1, r3]\n\
+    cmp r2, 0\n\
+    bne _0813CE0E\n\
+    strh r2, [r1, 0xA]\n\
+    ldrh r0, [r1, 0x8]\n\
+    adds r0, 0x1\n\
+    strh r0, [r1, 0x8]\n\
+    b _0813CE26\n\
+_0813CDA8:\n\
+    lsls r0, r3, 2\n\
+    adds r0, r3\n\
+    lsls r0, 3\n\
+    adds r2, r0, r2\n\
+    ldrh r1, [r2, 0xA]\n\
+    movs r4, 0xA\n\
+    ldrsh r0, [r2, r4]\n\
+    cmp r0, 0x3D\n\
+    bgt _0813CDE0\n\
+    adds r0, r1, 0x1\n\
+    strh r0, [r2, 0xA]\n\
+    movs r1, 0xA\n\
+    ldrsh r0, [r2, r1]\n\
+_0813CDC2:\n\
+    lsrs r1, r0, 31\n\
+    adds r0, r1\n\
+    movs r2, 0xFF\n\
+    lsls r2, 1\n\
+    ldr r3, _0813CDD8 @ =REG_BLDALPHA\n\
+    ldr r1, _0813CDDC @ =gUnknown_08393E64\n\
+    ands r0, r2\n\
+    adds r0, r1\n\
+    ldrh r0, [r0]\n\
+    strh r0, [r3]\n\
+    b _0813CE26\n\
+    .align 2, 0\n\
+_0813CDD8: .4byte REG_BLDALPHA\n\
+_0813CDDC: .4byte gUnknown_08393E64\n\
+_0813CDE0:\n\
+    ldr r1, _0813CDF4 @ =REG_BLDALPHA\n\
+    ldr r0, _0813CDF8 @ =gUnknown_08393E64\n\
+    ldrh r0, [r0, 0x3E]\n\
+    strh r0, [r1]\n\
+    movs r0, 0x10\n\
+_0813CDEA:\n\
+    strh r0, [r2, 0xA]\n\
+    ldrh r0, [r2, 0x8]\n\
+    adds r0, 0x1\n\
+    strh r0, [r2, 0x8]\n\
+    b _0813CE26\n\
+    .align 2, 0\n\
+_0813CDF4: .4byte REG_BLDALPHA\n\
+_0813CDF8: .4byte gUnknown_08393E64\n\
+_0813CDFC:\n\
+    lsls r0, r3, 2\n\
+    adds r0, r3\n\
+    lsls r0, 3\n\
+    adds r1, r0, r2\n\
+    ldrh r0, [r1, 0xA]\n\
+    movs r4, 0xA\n\
+    ldrsh r2, [r1, r4]\n\
+    cmp r2, 0\n\
+    beq _0813CE14\n\
+_0813CE0E:\n\
+    subs r0, 0x1\n\
+    strh r0, [r1, 0xA]\n\
+    b _0813CE26\n\
+_0813CE14:\n\
+    ldr r0, _0813CE2C @ =REG_BLDCNT\n\
+    strh r2, [r0]\n\
+    adds r0, 0x2\n\
+    strh r2, [r0]\n\
+    adds r0, 0x2\n\
+    strh r2, [r0]\n\
+    adds r0, r3, 0\n\
+    bl DestroyTask\n\
+_0813CE26:\n\
+    pop {r4}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
+_0813CE2C: .4byte REG_BLDCNT\n\
+    .syntax divided\n");
+}
+#endif
+
+void sub_813CE30(u16 a, u16 b, u16 c, u16 d)
+{
+    struct BgAffineSrcData src;
+    struct BgAffineDstData dest;
+    
+    src.texX = 0x8000;
+    src.texY = 0x8000;
+    src.scrX = a;
+    src.scrY = b;
+    src.sx = c;
+    src.sy = c;
+    src.alpha = d;
+    BgAffineSet(&src, &dest, 1);
+    REG_BG2PA = dest.pa;
+    REG_BG2PB = dest.pb;
+    REG_BG2PC = dest.pc;
+    REG_BG2PD = dest.pd;
+    REG_BG2X = dest.dx;
+    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;
+    u8 spriteId;
+    
+    if (e != 0)
+        LoadSpecialPokePic(&gMonFrontPicTable[a], gMonFrontPicCoords[a].x, gMonFrontPicCoords[a].y, 0x2000000, gUnknown_0840B5A0[d], a, 0, 1);
+    else
+        LoadSpecialPokePic(&gMonBackPicTable[a], gMonBackPicCoords[a].x, gMonBackPicCoords[a].y, 0x2000000, gUnknown_0840B5A0[d], a, 0, 0);
+    pal = species_and_otid_get_pal(a, 0, 0xFFFF);
+    LoadCompressedPalette(pal, 0x100 + d * 0x10, 0x20);
+    sub_8143648(d, d);
+    spriteId = CreateSprite(&gUnknown_02024E8C, b, c, (d + 1) * 4);
+    gSprites[spriteId].oam.paletteNum = d;
+    gSprites[spriteId].oam.priority = 1;
+    return spriteId;
+}
+
+u8 sub_813CFA8(u16 a, u16 b, u16 c, u16 d)
+{
+    u8 spriteId;
+    
+    DecompressPicFromTable_2(&gTrainerBackPicTable[a], gTrainerBackPicCoords[a].x, gTrainerBackPicCoords[a].y, (void *)0x2000000, gUnknown_0840B5A0[d], a);
+    LoadCompressedPalette(gTrainerBackPicPaletteTable[a].data, 0x100 + d * 0x10, 0x20);
+    sub_8143680(d, d);
+    gUnknown_02024E8C.anims = gUnknown_0840B064;
+    spriteId = CreateSprite(&gUnknown_02024E8C, b, c, 1);
+    gSprites[spriteId].oam.paletteNum = d;
+    gSprites[spriteId].oam.priority = 1;
+    return spriteId;
+}
+
+void sub_813D084(u8 a)
+{
+    u16 color;
+    
+    switch (a)
+    {
+    default:
+    case 0:
+        color = 0x3FF6;
+        break;
+    case 1:
+        color = 0x31DF;
+        break;
+    case 2:
+        color = 0x518C;
+        break;
+    }
+    gPlttBufferUnfaded[0xF1] = color;
+    gPlttBufferFaded[0xF1] = color;
+}