evolution graphics file is done

4 files changed, 167 insertions, 578 deletions

diff --git a/asm/evolution_graphics.s b/asm/evolution_graphics.s
deleted file mode 100644
index 12264b99b..000000000
--- a/asm/evolution_graphics.s
+++ /dev/null
@@ -1,574 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-
-
-
-	thumb_func_start nullsub_85
-nullsub_85: @ 8149E78
-	bx lr
-	thumb_func_end nullsub_85
-
-	thumb_func_start sub_8149E7C
-sub_8149E7C: @ 8149E7C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x28
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r1, 24
-	lsrs r7, r1, 24
-	movs r1, 0
-	ldr r3, _08149FB0 @ =sub_8149FC8
-	ldr r2, _08149FB4 @ =0x00007fff
-_08149E96:
-	lsls r0, r1, 1
-	add r0, sp
-	adds r0, 0x4
-	strh r2, [r0]
-	adds r0, r1, 0x1
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r1, 0xF
-	bls _08149E96
-	adds r0, r3, 0
-	movs r1, 0
-	bl CreateTask
-	mov r8, r0
-	mov r0, r8
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	ldr r0, _08149FB8 @ =gTasks
-	mov r1, r8
-	lsls r6, r1, 2
-	add r6, r8
-	lsls r6, 3
-	adds r6, r0
-	strh r5, [r6, 0xA]
-	strh r7, [r6, 0xC]
-	movs r1, 0x80
-	lsls r1, 1
-	strh r1, [r6, 0xE]
-	movs r0, 0x10
-	strh r0, [r6, 0x10]
-	movs r4, 0x80
-	lsls r4, 9
-	str r1, [sp]
-	movs r0, 0x1E
-	movs r2, 0
-	movs r3, 0
-	bl SetOamMatrix
-	movs r0, 0x10
-	ldrsh r1, [r6, r0]
-	adds r0, r4, 0
-	bl __divsi3
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	str r1, [sp]
-	movs r0, 0x1F
-	movs r2, 0
-	movs r3, 0
-	bl SetOamMatrix
-	ldr r1, _08149FBC @ =gSprites
-	mov r9, r1
-	lsls r2, r5, 4
-	adds r2, r5
-	lsls r2, 2
-	mov r3, r9
-	adds r3, 0x1C
-	adds r0, r2, r3
-	ldr r1, _08149FC0 @ =nullsub_85
-	str r1, [r0]
-	add r2, r9
-	ldrb r1, [r2, 0x1]
-	movs r4, 0x4
-	negs r4, r4
-	adds r0, r4, 0
-	ands r0, r1
-	movs r1, 0x1
-	orrs r0, r1
-	strb r0, [r2, 0x1]
-	ldrb r1, [r2, 0x3]
-	movs r0, 0x3F
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x3C
-	orrs r0, r1
-	strb r0, [r2, 0x3]
-	movs r0, 0x3E
-	adds r0, r2
-	mov r10, r0
-	ldrb r1, [r0]
-	movs r5, 0x5
-	negs r5, r5
-	adds r0, r5, 0
-	ands r0, r1
-	mov r1, r10
-	strb r0, [r1]
-	ldrb r1, [r2, 0x5]
-	lsrs r1, 4
-	lsls r1, 5
-	ldr r0, _08149FC4 @ =gPlttBufferFaded + 0x200
-	mov r10, r0
-	add r1, r10
-	add r0, sp, 0x4
-	movs r2, 0x10
-	str r3, [sp, 0x24]
-	bl CpuSet
-	lsls r1, r7, 4
-	adds r1, r7
-	lsls r1, 2
-	ldr r3, [sp, 0x24]
-	adds r3, r1, r3
-	ldr r0, _08149FC0 @ =nullsub_85
-	str r0, [r3]
-	add r1, r9
-	ldrb r0, [r1, 0x1]
-	ands r4, r0
-	movs r0, 0x1
-	orrs r4, r0
-	strb r4, [r1, 0x1]
-	ldrb r0, [r1, 0x3]
-	movs r2, 0x3E
-	orrs r0, r2
-	strb r0, [r1, 0x3]
-	adds r2, r1, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	ands r5, r0
-	strb r5, [r2]
-	ldrb r1, [r1, 0x5]
-	lsrs r1, 4
-	lsls r1, 5
-	add r1, r10
-	add r0, sp, 0x4
-	movs r2, 0x10
-	bl CpuSet
-	movs r1, 0
-	strh r1, [r6, 0x18]
-	mov r0, r8
-	add sp, 0x28
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08149FB0: .4byte sub_8149FC8
-_08149FB4: .4byte 0x00007fff
-_08149FB8: .4byte gTasks
-_08149FBC: .4byte gSprites
-_08149FC0: .4byte nullsub_85
-_08149FC4: .4byte gPlttBufferFaded + 0x200
-	thumb_func_end sub_8149E7C
-
-	thumb_func_start sub_8149FC8
-sub_8149FC8: @ 8149FC8
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _08149FE4 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	movs r0, 0
-	strh r0, [r1, 0x12]
-	movs r0, 0x8
-	strh r0, [r1, 0x14]
-	ldr r0, _08149FE8 @ =sub_8149FEC
-	str r0, [r1]
-	bx lr
-	.align 2, 0
-_08149FE4: .4byte gTasks
-_08149FE8: .4byte sub_8149FEC
-	thumb_func_end sub_8149FC8
-
-	thumb_func_start sub_8149FEC
-sub_8149FEC: @ 8149FEC
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r1, _0814A00C @ =gTasks
-	lsls r0, r3, 2
-	adds r0, r3
-	lsls r0, 3
-	adds r2, r0, r1
-	movs r1, 0x18
-	ldrsh r0, [r2, r1]
-	cmp r0, 0
-	beq _0814A010
-	adds r0, r3, 0
-	bl sub_814A208
-	b _0814A032
-	.align 2, 0
-_0814A00C: .4byte gTasks
-_0814A010:
-	ldrh r1, [r2, 0x14]
-	movs r4, 0x14
-	ldrsh r0, [r2, r4]
-	cmp r0, 0x80
-	bne _0814A022
-	adds r0, r3, 0
-	bl sub_814A158
-	b _0814A032
-_0814A022:
-	adds r0, r1, 0x2
-	strh r0, [r2, 0x14]
-	ldrh r0, [r2, 0x12]
-	movs r1, 0x1
-	eors r0, r1
-	strh r0, [r2, 0x12]
-	ldr r0, _0814A038 @ =sub_814A03C
-	str r0, [r2]
-_0814A032:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0814A038: .4byte sub_814A03C
-	thumb_func_end sub_8149FEC
-
-	thumb_func_start sub_814A03C
-sub_814A03C: @ 814A03C
-	push {r4-r7,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r1, _0814A060 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r2, r0, r1
-	movs r3, 0x18
-	ldrsh r0, [r2, r3]
-	adds r5, r1, 0
-	cmp r0, 0
-	beq _0814A068
-	ldr r0, _0814A064 @ =sub_814A208
-	str r0, [r2]
-	b _0814A14C
-	.align 2, 0
-_0814A060: .4byte gTasks
-_0814A064: .4byte sub_814A208
-_0814A068:
-	movs r6, 0
-	movs r7, 0x12
-	ldrsh r0, [r2, r7]
-	cmp r0, 0
-	bne _0814A0B8
-	movs r0, 0xE
-	ldrsh r1, [r2, r0]
-	movs r3, 0x14
-	ldrsh r0, [r2, r3]
-	movs r3, 0x80
-	lsls r3, 1
-	subs r0, r3, r0
-	cmp r1, r0
-	bge _0814A08E
-	ldrh r0, [r2, 0x14]
-	ldrh r7, [r2, 0xE]
-	adds r0, r7
-	strh r0, [r2, 0xE]
-	b _0814A092
-_0814A08E:
-	strh r3, [r2, 0xE]
-	movs r6, 0x1
-_0814A092:
-	lsls r2, r4, 2
-	adds r0, r2, r4
-	lsls r0, 3
-	adds r3, r0, r5
-	movs r0, 0x10
-	ldrsh r1, [r3, r0]
-	movs r7, 0x14
-	ldrsh r0, [r3, r7]
-	adds r0, 0x10
-	cmp r1, r0
-	ble _0814A0B2
-	ldrh r0, [r3, 0x10]
-	ldrh r1, [r3, 0x14]
-	subs r0, r1
-	strh r0, [r3, 0x10]
-	b _0814A102
-_0814A0B2:
-	movs r0, 0x10
-	strh r0, [r3, 0x10]
-	b _0814A0FC
-_0814A0B8:
-	movs r0, 0x10
-	ldrsh r1, [r2, r0]
-	movs r3, 0x14
-	ldrsh r0, [r2, r3]
-	movs r3, 0x80
-	lsls r3, 1
-	subs r0, r3, r0
-	cmp r1, r0
-	bge _0814A0D4
-	ldrh r0, [r2, 0x14]
-	ldrh r7, [r2, 0x10]
-	adds r0, r7
-	strh r0, [r2, 0x10]
-	b _0814A0D8
-_0814A0D4:
-	strh r3, [r2, 0x10]
-	movs r6, 0x1
-_0814A0D8:
-	lsls r2, r4, 2
-	adds r0, r2, r4
-	lsls r0, 3
-	adds r3, r0, r5
-	movs r0, 0xE
-	ldrsh r1, [r3, r0]
-	movs r7, 0x14
-	ldrsh r0, [r3, r7]
-	adds r0, 0x10
-	cmp r1, r0
-	ble _0814A0F8
-	ldrh r0, [r3, 0xE]
-	ldrh r1, [r3, 0x14]
-	subs r0, r1
-	strh r0, [r3, 0xE]
-	b _0814A102
-_0814A0F8:
-	movs r0, 0x10
-	strh r0, [r3, 0xE]
-_0814A0FC:
-	adds r0, r6, 0x1
-	lsls r0, 24
-	lsrs r6, r0, 24
-_0814A102:
-	adds r0, r2, r4
-	lsls r0, 3
-	adds r5, r0, r5
-	movs r0, 0xE
-	ldrsh r1, [r5, r0]
-	movs r4, 0x80
-	lsls r4, 9
-	adds r0, r4, 0
-	bl __divsi3
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	str r1, [sp]
-	movs r0, 0x1E
-	movs r2, 0
-	movs r3, 0
-	bl SetOamMatrix
-	movs r3, 0x10
-	ldrsh r1, [r5, r3]
-	adds r0, r4, 0
-	bl __divsi3
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	str r1, [sp]
-	movs r0, 0x1F
-	movs r2, 0
-	movs r3, 0
-	bl SetOamMatrix
-	cmp r6, 0x2
-	bne _0814A14C
-	ldr r0, _0814A154 @ =sub_8149FEC
-	str r0, [r5]
-_0814A14C:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0814A154: .4byte sub_8149FEC
-	thumb_func_end sub_814A03C
-
-	thumb_func_start sub_814A158
-sub_814A158: @ 814A158
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _0814A200 @ =gSprites
-	mov r8, r1
-	ldr r1, _0814A204 @ =gTasks
-	lsls r4, r0, 2
-	adds r4, r0
-	lsls r4, 3
-	adds r4, r1
-	movs r2, 0xA
-	ldrsh r1, [r4, r2]
-	lsls r2, r1, 4
-	adds r2, r1
-	lsls r2, 2
-	add r2, r8
-	ldrb r3, [r2, 0x1]
-	movs r6, 0x4
-	negs r6, r6
-	adds r1, r6, 0
-	ands r1, r3
-	strb r1, [r2, 0x1]
-	movs r2, 0xA
-	ldrsh r1, [r4, r2]
-	lsls r2, r1, 4
-	adds r2, r1
-	lsls r2, 2
-	add r2, r8
-	ldrb r3, [r2, 0x3]
-	movs r5, 0x3F
-	negs r5, r5
-	adds r1, r5, 0
-	ands r1, r3
-	strb r1, [r2, 0x3]
-	movs r1, 0xA
-	ldrsh r2, [r4, r1]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	add r1, r8
-	adds r1, 0x3E
-	ldrb r2, [r1]
-	movs r3, 0x4
-	orrs r2, r3
-	strb r2, [r1]
-	movs r1, 0xC
-	ldrsh r2, [r4, r1]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	add r1, r8
-	ldrb r2, [r1, 0x1]
-	ands r6, r2
-	strb r6, [r1, 0x1]
-	movs r1, 0xC
-	ldrsh r2, [r4, r1]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	add r1, r8
-	ldrb r2, [r1, 0x3]
-	ands r5, r2
-	strb r5, [r1, 0x3]
-	movs r1, 0xC
-	ldrsh r2, [r4, r1]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	add r1, r8
-	adds r1, 0x3E
-	ldrb r3, [r1]
-	movs r2, 0x5
-	negs r2, r2
-	ands r2, r3
-	strb r2, [r1]
-	bl DestroyTask
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0814A200: .4byte gSprites
-_0814A204: .4byte gTasks
-	thumb_func_end sub_814A158
-
-	thumb_func_start sub_814A208
-sub_814A208: @ 814A208
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _0814A2B0 @ =gSprites
-	mov r8, r1
-	ldr r1, _0814A2B4 @ =gTasks
-	lsls r4, r0, 2
-	adds r4, r0
-	lsls r4, 3
-	adds r4, r1
-	movs r2, 0xA
-	ldrsh r1, [r4, r2]
-	lsls r2, r1, 4
-	adds r2, r1
-	lsls r2, 2
-	add r2, r8
-	ldrb r3, [r2, 0x1]
-	movs r6, 0x4
-	negs r6, r6
-	adds r1, r6, 0
-	ands r1, r3
-	strb r1, [r2, 0x1]
-	movs r2, 0xA
-	ldrsh r1, [r4, r2]
-	lsls r2, r1, 4
-	adds r2, r1
-	lsls r2, 2
-	add r2, r8
-	ldrb r3, [r2, 0x3]
-	movs r5, 0x3F
-	negs r5, r5
-	adds r1, r5, 0
-	ands r1, r3
-	strb r1, [r2, 0x3]
-	movs r1, 0xA
-	ldrsh r2, [r4, r1]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	add r1, r8
-	adds r1, 0x3E
-	ldrb r3, [r1]
-	movs r2, 0x5
-	negs r2, r2
-	ands r2, r3
-	strb r2, [r1]
-	movs r1, 0xC
-	ldrsh r2, [r4, r1]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	add r1, r8
-	ldrb r2, [r1, 0x1]
-	ands r6, r2
-	strb r6, [r1, 0x1]
-	movs r1, 0xC
-	ldrsh r2, [r4, r1]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	add r1, r8
-	ldrb r2, [r1, 0x3]
-	ands r5, r2
-	strb r5, [r1, 0x3]
-	movs r1, 0xC
-	ldrsh r2, [r4, r1]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	add r1, r8
-	adds r1, 0x3E
-	ldrb r2, [r1]
-	movs r3, 0x4
-	orrs r2, r3
-	strb r2, [r1]
-	bl DestroyTask
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0814A2B0: .4byte gSprites
-_0814A2B4: .4byte gTasks
-	thumb_func_end sub_814A208
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/include/evolution_graphics.h b/include/evolution_graphics.h
new file mode 100644
index 000000000..c217f22af
--- /dev/null
+++ b/include/evolution_graphics.h
@@ -0,0 +1,13 @@
+#ifndef GUARD_EVOLUTION_GRAPHICS_H
+#define GUARD_EVOLUTION_GRAPHICS_H
+
+void LoadEvoSparkleSpriteAndPal(void);
+
+u8 LaunchTask_PreEvoSparklesSet1(u16 arg0);
+u8 LaunchTask_PreEvoSparklesSet2(void);
+u8 LaunchTask_PostEvoSparklesSet1(void);
+u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 arg0);
+u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 arg0);
+u8 sub_8149E7C(u8 preEvoSpriteID, u8 postEvoSpriteID);
+
+#endif // GUARD_EVOLUTION_GRAPHICS_H
diff --git a/ld_script.txt b/ld_script.txt
index 5a8cc3ff5..f7024cba7 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -267,7 +267,6 @@ SECTIONS {
         src/clear_save_data_menu.o(.text);
         src/intro_credits_graphics.o(.text);
         src/evolution_graphics.o(.text);
-        asm/evolution_graphics.o(.text);
         src/bard_music.o(.text);
         src/fldeff_teleport.o(.text);
         src/unknown_debug_menu.o(.text);
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
index 45f60c614..9fd2d7b7a 100644
--- a/src/evolution_graphics.c
+++ b/src/evolution_graphics.c
@@ -25,6 +25,12 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash_Trade(u8 taskID);
 static void EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade(u8 taskID);
 static void EvoTask_DestroyPostSet2AndFlashTask(u8 taskID);
 
+static void sub_8149FC8(u8 taskID);
+static void sub_8149FEC(u8 taskID);
+static void PreEvoVisible_PostEvoInvisible_KillTask(u8 taskID);
+static void PreEvoInVisible_PostEvoVisible_KillTask(u8 taskID);
+static void sub_814A03C(u8 taskID);
+
 // const data
 static const u16 sEvoSparklePalette[] = INCBIN_U16("graphics/misc/evo_sparkle.gbapal");
 static const u8 sEvoSparkleTiles[] = INCBIN_U8("graphics/misc/evo_sparkle.4bpp.lz");
@@ -230,7 +236,7 @@ static void SpriteCB_PostEvoSparkleSet2(struct Sprite* sprite)
         DestroySprite(sprite);
 }
 
-void CreatePostEvoSparkleSet2(u8 arg0)
+static void CreatePostEvoSparkleSet2(u8 arg0)
 {
     u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 56, 0);
     if (spriteID != MAX_SPRITES)
@@ -251,6 +257,8 @@ void LoadEvoSparkleSpriteAndPal(void)
     LoadSpritePalettes(sEvoSparkleSpritePals);
 }
 
+#define tFrameCounter   data[15]
+
 u8 LaunchTask_PreEvoSparklesSet1(u16 arg0)
 {
     u8 taskID = CreateTask(EvoTask_BeginPreSet1_FadeAndPlaySE, 0);
@@ -258,8 +266,6 @@ u8 LaunchTask_PreEvoSparklesSet1(u16 arg0)
     return taskID;
 }
 
-#define tFrameCounter   data[15]
-
 static void EvoTask_BeginPreSet1_FadeAndPlaySE(u8 taskID)
 {
     SetEvoSparklesMatrices();
@@ -460,3 +466,148 @@ static void EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade(u8 taskID)
         gTasks[taskID].func = EvoTask_DestroyPostSet2AndFlashTask;
 }
 
+#undef tFrameCounter
+
+static void PokeEvoSprite_DummySpriteCB(struct Sprite* sprite)
+{
+
+}
+
+#define tPreEvoSpriteID     data[1]
+#define tPostEvoSpriteID    data[2]
+#define tEvoStopped         data[8]
+
+u8 sub_8149E7C(u8 preEvoSpriteID, u8 postEvoSpriteID)
+{
+    u16 i;
+    u16 stack[16];
+    u8 taskID;
+    s32 toDiv;
+
+    for (i = 0; i < 16; i++)
+        stack[i] = 0x7FFF;
+
+    taskID = CreateTask(sub_8149FC8, 0);
+    gTasks[taskID].tPreEvoSpriteID = preEvoSpriteID;
+    gTasks[taskID].tPostEvoSpriteID = postEvoSpriteID;
+    gTasks[taskID].data[3] = 256;
+    gTasks[taskID].data[4] = 16;
+
+    toDiv = 65536;
+    SetOamMatrix(30, 256, 0, 0, 256);
+    SetOamMatrix(31, toDiv / gTasks[taskID].data[4], 0, 0, toDiv / gTasks[taskID].data[4]);
+
+    gSprites[preEvoSpriteID].callback = PokeEvoSprite_DummySpriteCB;
+    gSprites[preEvoSpriteID].oam.affineMode = 1;
+    gSprites[preEvoSpriteID].oam.matrixNum = 30;
+    gSprites[preEvoSpriteID].invisible = 0;
+    CpuSet(stack, &gPlttBufferFaded[0x100 + (gSprites[preEvoSpriteID].oam.paletteNum * 16)], 16);
+
+    gSprites[postEvoSpriteID].callback = PokeEvoSprite_DummySpriteCB;
+    gSprites[postEvoSpriteID].oam.affineMode = 1;
+    gSprites[postEvoSpriteID].oam.matrixNum = 31;
+    gSprites[postEvoSpriteID].invisible = 0;
+    CpuSet(stack, &gPlttBufferFaded[0x100 + (gSprites[postEvoSpriteID].oam.paletteNum * 16)], 16);
+
+    gTasks[taskID].tEvoStopped = FALSE;
+    return taskID;
+}
+
+static void sub_8149FC8(u8 taskID)
+{
+    gTasks[taskID].data[5] = 0;
+    gTasks[taskID].data[6] = 8;
+    gTasks[taskID].func = sub_8149FEC;
+}
+
+static void sub_8149FEC(u8 taskID)
+{
+    if (gTasks[taskID].tEvoStopped)
+        PreEvoVisible_PostEvoInvisible_KillTask(taskID);
+    else if (gTasks[taskID].data[6] == 128)
+        PreEvoInVisible_PostEvoVisible_KillTask(taskID);
+    else
+    {
+        gTasks[taskID].data[6] += 2;
+        gTasks[taskID].data[5] ^= 1;
+        gTasks[taskID].func = sub_814A03C;
+    }
+}
+
+static void sub_814A03C(u8 taskID)
+{
+    if (gTasks[taskID].data[tEvoStopped])
+        gTasks[taskID].func = PreEvoVisible_PostEvoInvisible_KillTask;
+    else
+    {
+        u16 oamMatrixArg;
+        u8 r6 = 0;
+        if (gTasks[taskID].data[5] == 0)
+        {
+            if (gTasks[taskID].data[3] < 256 - gTasks[taskID].data[6])
+                gTasks[taskID].data[3] += gTasks[taskID].data[6];
+            else
+            {
+                gTasks[taskID].data[3] = 256;
+                r6++;
+            }
+            if (gTasks[taskID].data[4] > 16 + gTasks[taskID].data[6])
+                gTasks[taskID].data[4]  -= gTasks[taskID].data[6];
+            else
+            {
+                gTasks[taskID].data[4] = 16;
+                r6++;
+            }
+        }
+        else
+        {
+            if (gTasks[taskID].data[4] < 256 - gTasks[taskID].data[6])
+                gTasks[taskID].data[4] += gTasks[taskID].data[6];
+            else
+            {
+                gTasks[taskID].data[4] = 256;
+                r6++;
+            }
+            if (gTasks[taskID].data[3] > 16 + gTasks[taskID].data[6])
+                gTasks[taskID].data[3]  -= gTasks[taskID].data[6];
+            else
+            {
+                gTasks[taskID].data[3] = 16;
+                r6++;
+            }
+        }
+        oamMatrixArg = 65536 / gTasks[taskID].data[3];
+        SetOamMatrix(30, oamMatrixArg, 0, 0, oamMatrixArg);
+
+        oamMatrixArg = 65536 / gTasks[taskID].data[4];
+        SetOamMatrix(31, oamMatrixArg, 0, 0, oamMatrixArg);
+        if (r6 == 2)
+            gTasks[taskID].func = sub_8149FEC;
+    }
+}
+
+static void PreEvoInVisible_PostEvoVisible_KillTask(u8 taskID)
+{
+    gSprites[gTasks[taskID].tPreEvoSpriteID].oam.affineMode = 0;
+    gSprites[gTasks[taskID].tPreEvoSpriteID].oam.matrixNum = 0;
+    gSprites[gTasks[taskID].tPreEvoSpriteID].invisible = 1;
+
+    gSprites[gTasks[taskID].tPostEvoSpriteID].oam.affineMode = 0;
+    gSprites[gTasks[taskID].tPostEvoSpriteID].oam.matrixNum = 0;
+    gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = 0;
+
+    DestroyTask(taskID);
+}
+
+static void PreEvoVisible_PostEvoInvisible_KillTask(u8 taskID)
+{
+    gSprites[gTasks[taskID].tPreEvoSpriteID].oam.affineMode = 0;
+    gSprites[gTasks[taskID].tPreEvoSpriteID].oam.matrixNum = 0;
+    gSprites[gTasks[taskID].tPreEvoSpriteID].invisible = 0;
+
+    gSprites[gTasks[taskID].tPostEvoSpriteID].oam.affineMode = 0;
+    gSprites[gTasks[taskID].tPostEvoSpriteID].oam.matrixNum = 0;
+    gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = 1;
+
+    DestroyTask(taskID);
+}