2 files changed, 37 insertions, 111 deletions

diff --git a/asm/ghost.s b/asm/ghost.s
index e5f239b5c..d529715c5 100644
--- a/asm/ghost.s
+++ b/asm/ghost.s
@@ -7,117 +7,6 @@
 
 	@ ghost
 
-	thumb_func_start sub_80DE2DC
-sub_80DE2DC: @ 80DE2DC
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	ldr r1, _080DE300 @ =gTasks
-	adds r4, r0, r1
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x1
-	beq _080DE37C
-	cmp r0, 0x1
-	bgt _080DE304
-	cmp r0, 0
-	beq _080DE30A
-	b _080DE3A6
-	.align 2, 0
-_080DE300: .4byte gTasks
-_080DE304:
-	cmp r0, 0x2
-	beq _080DE3A0
-	b _080DE3A6
-_080DE30A:
-	ldrh r1, [r4, 0xA]
-	adds r1, 0x1
-	strh r1, [r4, 0xA]
-	movs r0, 0x3
-	ands r0, r1
-	strh r0, [r4, 0x12]
-	cmp r0, 0x1
-	bne _080DE328
-	ldrh r1, [r4, 0xC]
-	movs r2, 0xC
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	ble _080DE328
-	subs r0, r1, 0x1
-	strh r0, [r4, 0xC]
-_080DE328:
-	movs r1, 0x12
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x3
-	bne _080DE33E
-	ldrh r1, [r4, 0xE]
-	movs r2, 0xE
-	ldrsh r0, [r4, r2]
-	cmp r0, 0xF
-	bgt _080DE33E
-	adds r0, r1, 0x1
-	strh r0, [r4, 0xE]
-_080DE33E:
-	ldr r2, _080DE374 @ =REG_BLDALPHA
-	ldrh r0, [r4, 0xE]
-	lsls r0, 8
-	ldrh r1, [r4, 0xC]
-	orrs r0, r1
-	strh r0, [r2]
-	ldr r1, [r4, 0xC]
-	movs r0, 0x80
-	lsls r0, 13
-	cmp r1, r0
-	bne _080DE3A6
-	movs r1, 0xA
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x50
-	ble _080DE3A6
-	movs r2, 0x8
-	ldrsh r1, [r4, r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _080DE378 @ =gSprites
-	adds r0, r1
-	bl obj_delete_but_dont_free_vram
-	movs r0, 0x1
-	strh r0, [r4, 0x10]
-	b _080DE3A6
-	.align 2, 0
-_080DE374: .4byte REG_BLDALPHA
-_080DE378: .4byte gSprites
-_080DE37C:
-	ldrh r0, [r4, 0x14]
-	adds r0, 0x1
-	movs r1, 0
-	strh r0, [r4, 0x14]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x1
-	ble _080DE3A6
-	ldr r0, _080DE39C @ =REG_BLDCNT
-	strh r1, [r0]
-	adds r0, 0x2
-	strh r1, [r0]
-	ldrh r0, [r4, 0x10]
-	adds r0, 0x1
-	strh r0, [r4, 0x10]
-	b _080DE3A6
-	.align 2, 0
-_080DE39C: .4byte REG_BLDCNT
-_080DE3A0:
-	adds r0, r2, 0
-	bl DestroyAnimVisualTask
-_080DE3A6:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DE2DC
-
 	thumb_func_start sub_80DE3AC
 sub_80DE3AC: @ 80DE3AC
 	push {lr}
diff --git a/src/ghost.c b/src/ghost.c
index 0c547a43f..3a13f0b7c 100644
--- a/src/ghost.c
+++ b/src/ghost.c
@@ -373,4 +373,41 @@ void sub_80DE1B0(u8 taskId) {
 	StoreSpriteCallbackInData(&gSprites[task->data[0]], SpriteCallbackDummy);
 	gSprites[task->data[0]].callback = &sub_8078394;
 	task->func = &sub_80DE2DC;
+}
+
+void sub_80DE2DC(u8 taskId) {
+	struct Task *task;
+	
+	task = &gTasks[taskId];
+	switch (task->data[4]) {
+	case 0:
+		task->data[1] += 1;
+		task->data[5] = task->data[1] & 3;
+		if (task->data[5] == 1) {
+			if (task->data[2] > 0)
+				task->data[2] -= 1;
+		}
+		if (task->data[5] == 3) {
+			if (task->data[3] <= 15)
+				task->data[3] += 1;
+		}
+		REG_BLDALPHA = (task->data[3] << 8) | task->data[2];
+		if (task->data[3] != 16 || task->data[2] != 0)
+			break;
+		if (task->data[1] <= 80)
+			break;
+		obj_delete_but_dont_free_vram(&gSprites[task->data[0]]);
+		task->data[4] = 1;
+		break;
+	case 1:
+		task->data[6] += 1;
+		if (task->data[6] <= 1)
+			break;
+		REG_BLDCNT = 0;
+		REG_BLDALPHA = 0;
+		task->data[4] += 1;
+		break;
+	case 2:
+		DestroyAnimVisualTask(taskId);
+	}
 }
\ No newline at end of file