2 files changed, 32 insertions, 144 deletions

diff --git a/asm/ghost.s b/asm/ghost.s
index 3042f48d3..e5f239b5c 100644
--- a/asm/ghost.s
+++ b/asm/ghost.s
@@ -7,149 +7,6 @@
 
 	@ ghost
 
-	thumb_func_start sub_80DE1B0
-sub_80DE1B0: @ 80DE1B0
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	ldr r1, _080DE1DC @ =gTasks
-	adds r5, r0, r1
-	movs r0, 0x1
-	bl duplicate_obj_of_side_rel2move_in_transparent_mode
-	movs r6, 0
-	movs r1, 0
-	strh r0, [r5, 0x8]
-	lsls r0, 16
-	cmp r0, 0
-	bge _080DE1E0
-	adds r0, r4, 0
-	bl DestroyAnimVisualTask
-	b _080DE2C0
-	.align 2, 0
-_080DE1DC: .4byte gTasks
-_080DE1E0:
-	strh r1, [r5, 0xA]
-	movs r0, 0xF
-	strh r0, [r5, 0xC]
-	movs r0, 0x2
-	strh r0, [r5, 0xE]
-	strh r1, [r5, 0x10]
-	ldr r1, _080DE244 @ =REG_BLDCNT
-	movs r2, 0xFD
-	lsls r2, 6
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r2, _080DE248 @ =REG_BLDALPHA
-	ldrh r0, [r5, 0xE]
-	lsls r0, 8
-	ldrh r1, [r5, 0xC]
-	orrs r0, r1
-	strh r0, [r2]
-	ldr r4, _080DE24C @ =gSprites
-	movs r0, 0x8
-	ldrsh r1, [r5, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0x50
-	strh r1, [r0, 0x2E]
-	ldr r0, _080DE250 @ =gAnimBankTarget
-	ldrb r0, [r0]
-	bl GetBattlerSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _080DE258
-	movs r2, 0x8
-	ldrsh r1, [r5, r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldr r1, _080DE254 @ =0x0000ff70
-	strh r1, [r0, 0x30]
-	movs r0, 0x8
-	ldrsh r1, [r5, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0x70
-	b _080DE276
-	.align 2, 0
-_080DE244: .4byte REG_BLDCNT
-_080DE248: .4byte REG_BLDALPHA
-_080DE24C: .4byte gSprites
-_080DE250: .4byte gAnimBankTarget
-_080DE254: .4byte 0x0000ff70
-_080DE258:
-	movs r2, 0x8
-	ldrsh r1, [r5, r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0x90
-	strh r1, [r0, 0x30]
-	movs r0, 0x8
-	ldrsh r1, [r5, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldr r1, _080DE2C8 @ =0x0000ff90
-_080DE276:
-	strh r1, [r0, 0x32]
-	ldr r4, _080DE2CC @ =gSprites
-	movs r2, 0x8
-	ldrsh r1, [r5, r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r2, 0
-	strh r2, [r0, 0x34]
-	movs r0, 0x8
-	ldrsh r1, [r5, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	strh r2, [r0, 0x36]
-	movs r2, 0x8
-	ldrsh r1, [r5, r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldr r1, _080DE2D0 @ =SpriteCallbackDummy
-	bl StoreSpriteCallbackInData
-	movs r0, 0x8
-	ldrsh r1, [r5, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r4, 0x1C
-	adds r0, r4
-	ldr r1, _080DE2D4 @ =sub_8078394
-	str r1, [r0]
-	ldr r0, _080DE2D8 @ =sub_80DE2DC
-	str r0, [r5]
-_080DE2C0:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DE2C8: .4byte 0x0000ff90
-_080DE2CC: .4byte gSprites
-_080DE2D0: .4byte SpriteCallbackDummy
-_080DE2D4: .4byte sub_8078394
-_080DE2D8: .4byte sub_80DE2DC
-	thumb_func_end sub_80DE1B0
-
 	thumb_func_start sub_80DE2DC
 sub_80DE2DC: @ 80DE2DC
 	push {r4,lr}
diff --git a/src/ghost.c b/src/ghost.c
index 16f4241c0..0c547a43f 100644
--- a/src/ghost.c
+++ b/src/ghost.c
@@ -17,6 +17,7 @@ void sub_80DDE7C(u8 taskId);
 void sub_80DDED0(u8 taskId);
 void sub_80DDFE8(struct Sprite *);
 void sub_80DE114(struct Sprite *);
+void sub_80DE2DC(u8 taskId);
 
 void sub_80DDB6C(struct Sprite *sprite) {
     InitAnimSpritePos(sprite, 1);
@@ -342,4 +343,34 @@ void sub_80DE114(struct Sprite *sprite) {
 				"\tpop {r0}\n"
 				"\tbx r0\n");
 }
-#endif
\ No newline at end of file
+#endif
+
+void sub_80DE1B0(u8 taskId) {
+	struct Task *task;
+	
+	task = &gTasks[taskId];
+	task->data[0] = duplicate_obj_of_side_rel2move_in_transparent_mode(1);
+	if (task->data[0] < 0) {
+		DestroyAnimVisualTask(taskId);
+		return;
+	}
+	task->data[1] = 0;
+	task->data[2] = 15;
+	task->data[3] = 2;
+	task->data[4] = 0;
+	REG_BLDCNT = 0x3F40;
+	REG_BLDALPHA = (task->data[3] << 8) | task->data[2];
+	gSprites[task->data[0]].data[0] = 80;
+	if (GetBattlerSide(gAnimBankTarget) == 0) {
+		gSprites[task->data[0]].data[1] = 0xff70;
+		gSprites[task->data[0]].data[2] = 0x70;
+	} else {
+		gSprites[task->data[0]].data[1] = 0x90;
+		gSprites[task->data[0]].data[2] = 0xff90;
+	}
+	gSprites[task->data[0]].data[3] = 0;
+	gSprites[task->data[0]].data[4] = 0;
+	StoreSpriteCallbackInData(&gSprites[task->data[0]], SpriteCallbackDummy);
+	gSprites[task->data[0]].callback = &sub_8078394;
+	task->func = &sub_80DE2DC;
+}
\ No newline at end of file