Enemy Unk progress

Author: JaceCear

asm/enemy_unknown_code.s

@@ -6,202 +6,8 @@
 .arm
 
 .if 0
-	thumb_func_start sub_805CE14
-sub_805CE14: @ 0x0805CE14
-	push {r4, r5, r6, r7, lr}
-	mov r7, sl
-	mov r6, sb
-	mov r5, r8
-	push {r5, r6, r7}
-	sub sp, #8
-	adds r6, r0, #0
-	mov r8, r1
-	mov sl, r3
-	movs r7, #0
-	ldr r0, [r6]
-	asrs r5, r0, #8
-	ldr r0, [r6, #4]
-	asrs r4, r0, #8
-	cmp r2, #0
-	beq _0805CE40
-	ldrh r0, [r2]
-	lsls r0, r0, #8
-	adds r5, r5, r0
-	ldrh r0, [r2, #2]
-	lsls r0, r0, #8
-	adds r4, r4, r0
-_0805CE40:
-	str r7, [sp]
-	ldr r0, _0805CEB8 @ =sub_805217C
-	mov sb, r0
-	str r0, [sp, #4]
-	adds r0, r4, #0
-	adds r1, r5, #0
-	movs r2, #1
-	movs r3, #8
-	rsbs r3, r3, #0
-	bl sub_8052394
-	lsls r0, r0, #0x18
-	lsrs r7, r0, #0x18
-	mov r1, sl
-	movs r0, #0
-	ldrsb r0, [r1, r0]
-	cmp r0, #1
-	bne _0805CE8E
-	lsls r0, r7, #0x18
-	asrs r0, r0, #0x18
-	movs r1, #1
-	rsbs r1, r1, #0
-	cmp r0, r1
-	bne _0805CE8E
-	adds r0, r4, #1
-	movs r1, #0
-	str r1, [sp]
-	mov r2, sb
-	str r2, [sp, #4]
-	adds r1, r5, #0
-	movs r2, #1
-	movs r3, #8
-	rsbs r3, r3, #0
-	bl sub_8052394
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	cmp r0, #1
-	beq _0805CEA8
-_0805CE8E:
-	mov r0, sl
-	strb r7, [r0]
-	lsls r0, r7, #0x18
-	asrs r1, r0, #0x10
-	ldr r0, [r6, #4]
-	subs r0, r0, r1
-	str r0, [r6, #4]
-	mov r2, r8
-	cmp r2, #0
-	beq _0805CEA8
-	ldr r0, [r2, #4]
-	subs r0, r0, r1
-	str r0, [r2, #4]
-_0805CEA8:
-	add sp, #8
-	pop {r3, r4, r5}
-	mov r8, r3
-	mov sb, r4
-	mov sl, r5
-	pop {r4, r5, r6, r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805CEB8: .4byte sub_805217C
 .endif
 
-	thumb_func_start sub_805CEBC
-sub_805CEBC: @ 0x0805CEBC
-	push {r4, r5, r6, r7, lr}
-	mov r7, sb
-	mov r6, r8
-	push {r6, r7}
-	sub sp, #4
-	mov r8, r0
-	mov sb, r1
-	adds r4, r2, #0
-	adds r5, r3, #0
-	ldr r6, [sp, #0x20]
-	ldr r7, [sp, #0x24]
-	lsls r4, r4, #0x10
-	lsrs r4, r4, #0x10
-	lsls r5, r5, #0x10
-	lsrs r5, r5, #0x10
-	lsls r6, r6, #0x18
-	lsrs r6, r6, #0x18
-	ldr r0, _0805CF2C @ =Task_40_805C198
-	ldr r2, _0805CF30 @ =0x00004040
-	ldr r1, _0805CF34 @ =TaskDestructor_805D09C
-	str r1, [sp]
-	movs r1, #0x40
-	movs r3, #0
-	bl TaskCreate
-	ldrh r0, [r0, #6]
-	movs r1, #0xc0
-	lsls r1, r1, #0x12
-	adds r0, r0, r1
-	movs r2, #0
-	movs r1, #0x3c
-	strh r1, [r0, #0xa]
-	mov r1, r8
-	str r1, [r0, #0xc]
-	mov r1, sb
-	str r1, [r0, #0x10]
-	strh r4, [r0, #6]
-	strh r5, [r0, #8]
-	str r7, [r0, #0x14]
-	strb r6, [r0, #4]
-	strb r2, [r0, #5]
-	bl sub_805C138
-	cmp r6, #0
-	bne _0805CF1C
-	movs r0, #0x8a      @ SE_POOF
-	bl m4aSongNumStart
-_0805CF1C:
-	add sp, #4
-	pop {r3, r4}
-	mov r8, r3
-	mov sb, r4
-	pop {r4, r5, r6, r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805CF2C: .4byte Task_40_805C198
-_0805CF30: .4byte 0x00004040
-_0805CF34: .4byte TaskDestructor_805D09C
-
-	thumb_func_start sub_805CF38
-sub_805CF38: @ 0x0805CF38
-	push {r4, r5, r6, r7, lr}
-	sub sp, #4
-	adds r6, r0, #0
-	adds r7, r1, #0
-	lsls r2, r2, #0x10
-	lsrs r5, r2, #0x10
-	lsls r3, r3, #0x10
-	lsrs r4, r3, #0x10
-	ldr r0, [sp, #0x18]
-	cmp r0, #0
-	beq _0805CF76
-	ldr r0, _0805CF80 @ =Task_14_805C03C
-	ldr r2, _0805CF84 @ =0x00004040
-	ldr r1, _0805CF88 @ =TaskDestructor_805C03C
-	str r1, [sp]
-	movs r1, #0x14
-	movs r3, #0
-	bl TaskCreate
-	ldrh r0, [r0, #6]
-	movs r1, #0xc0
-	lsls r1, r1, #0x12
-	adds r0, r0, r1
-	movs r1, #0
-	strb r1, [r0]
-	ldr r1, [sp, #0x18]
-	str r1, [r0, #0x10]
-	str r6, [r0, #8]
-	str r7, [r0, #0xc]
-	strh r5, [r0, #2]
-	strh r4, [r0, #4]
-_0805CF76:
-	add sp, #4
-	pop {r4, r5, r6, r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805CF80: .4byte Task_14_805C03C
-_0805CF84: .4byte 0x00004040
-_0805CF88: .4byte TaskDestructor_805C03C
-
-    thumb_func_start TaskDestructor_805C03C
-TaskDestructor_805C03C:
-    bx lr
-    .align 2 , 0
-
 	thumb_func_start sub_805CF90
 sub_805CF90: @ 0x0805CF90
 	push {r4, r5, lr}

src/game/enemies/enemy_unknown_code.c

@@ -710,45 +710,39 @@ void sub_805CE14(Vec2_32 *qVal, Vec2_32 *param1, u16 region[2], s8 *param3)
     }
 }
 
-#if 0
-void sub_805CEBC(s32 arg0, s32 arg1, u16 arg2, u16 arg3, s32 arg4, s32 arg5) {
-    u16 temp_r0;
-    u8 temp_r6;
-
-    temp_r6 = (u8) arg4;
-    temp_r0 = TaskCreate(Task_40_805C198, 0x40U, 0x4040U, 0U, TaskDestructor_805D09C)->data;
-    temp_r0->unkA = 0x3C;
-    temp_r0->unkC = arg0;
-    temp_r0->unk10 = arg1;
-    temp_r0->unk6 = arg2;
-    temp_r0->unk8 = arg3;
-    temp_r0->unk14 = arg5;
-    temp_r0->unk4 = temp_r6;
-    temp_r0->unk5 = 0;
-    sub_805C138();
-    if (temp_r6 == 0) {
+void sub_805CEBC(s32 qWorldX, s32 qWorldY, u16 regionX, u16 regionY, u8 arg4, Player *p)
+{
+    EUC_Strc40 *strc = TASK_DATA(TaskCreate(Task_40_805C198, sizeof(EUC_Strc40), 0x4040U, 0U, TaskDestructor_805D09C));
+    strc->unkA = 60;
+    strc->qWorldX = qWorldX;
+    strc->qWorldY = qWorldY;
+    strc->regionX = regionX;
+    strc->regionY = regionY;
+    strc->p = p;
+    strc->unk4 = arg4;
+    strc->unk5 = 0;
+    sub_805C138(strc);
+    if (arg4 == 0) {
         m4aSongNumStart(SE_POOF);
     }
 }
 
-static inline void sub_805CF38(s32 arg0, s32 arg1, u16 arg2, u16 arg3, s32 arg4) {
-    u16 temp_r0;
-
-    if (arg4 != 0) {
-        temp_r0 = TaskCreate(Task_14_805C03C, 0x14U, 0x4040U, 0U, TaskDestructor_805C03C)->data;
-        temp_r0->unk0 = 0;
-        temp_r0->unk10 = arg4;
-        temp_r0->unk8 = arg0;
-        temp_r0->unkC = arg1;
-        temp_r0->unk2 = arg2;
-        temp_r0->unk4 = arg3;
+void sub_805CF38(s32 qWorldX, s32 qWorldY, u16 regionX, u16 regionY, Player *p)
+{
+    if (p != 0) {
+        EUC_Strc14 *strc14 = TASK_DATA(TaskCreate(Task_14_805C03C, sizeof(EUC_Strc14), 0x4040U, 0U, TaskDestructor_805C03C));
+        strc14->unk0 = 0;
+        strc14->p = p;
+        strc14->qWorldX = qWorldX;
+        strc14->qWorldY = qWorldY;
+        strc14->regionX = regionX;
+        strc14->regionY = regionY;
     }
 }
 
-void TaskDestructor_805C03C(Task *arg0) {
-
-}
+void TaskDestructor_805C03C(Task *arg0) { }
 
+#if 0
 s32 sub_805CF90(s16 arg0, s16 arg1, s16 arg2, s32 arg3) {
     s32 temp_r4;