Finish enemy_unknown_code module

Author: JaceCear

asm/enemy_unknown_code.s

@@ -1,171 +0,0 @@
-.include "asm/macros.inc"
-.include "constants/constants.inc"
-
-.text
-.syntax unified
-.arm
-
-.if 0
-.endif
-
-	thumb_func_start sub_805CF90
-sub_805CF90: @ 0x0805CF90
-	push {r4, r5, lr}
-	adds r4, r1, #0
-	adds r5, r2, #0
-	ldr r2, _0805CFDC @ =gCamera
-	ldr r1, [r2]
-	subs r0, r0, r1
-	ldr r1, [r2, #4]
-	subs r4, r4, r1
-	adds r0, #0x80
-	movs r1, #0xf8
-	lsls r1, r1, #1
-	cmp r0, r1
-	bhi _0805CFBA
-	adds r0, r4, #0
-	adds r0, #0x80
-	cmp r0, #0
-	blt _0805CFBA
-	movs r0, #0x90
-	lsls r0, r0, #1
-	cmp r4, r0
-	ble _0805CFE0
-_0805CFBA:
-	adds r1, r5, #0
-	adds r1, #0x80
-	movs r0, #0xf8
-	lsls r0, r0, #1
-	cmp r1, r0
-	bhi _0805CFD6
-	adds r0, r3, #0
-	adds r0, #0x80
-	cmp r0, #0
-	blt _0805CFD6
-	movs r0, #0x90
-	lsls r0, r0, #1
-	cmp r3, r0
-	ble _0805CFE0
-_0805CFD6:
-	movs r0, #0
-	b _0805CFE2
-	.align 2, 0
-_0805CFDC: .4byte gCamera
-_0805CFE0:
-	movs r0, #1
-_0805CFE2:
-	pop {r4, r5}
-	pop {r1}
-	bx r1
-
-	thumb_func_start sub_805CFE8
-sub_805CFE8: @ 0x0805CFE8
-	push {r4, lr}
-	adds r1, r0, #0
-	ldr r0, [sp, #0xc]
-	lsls r0, r0, #0x18
-	lsrs r3, r0, #0x18
-	movs r0, #0x80
-	lsls r0, r0, #9
-	ands r0, r2
-	cmp r0, #0
-	beq _0805D004
-	movs r4, #0x1a
-	ldrsh r0, [r1, r4]
-	cmp r0, #0
-	blt _0805D016
-_0805D004:
-	movs r0, #0x80
-	lsls r0, r0, #0xa
-	ands r0, r2
-	cmp r0, #0
-	beq _0805D052
-	movs r2, #0x1a
-	ldrsh r0, [r1, r2]
-	cmp r0, #0
-	ble _0805D052
-_0805D016:
-	ldr r0, [sp, #8]
-	subs r0, #0x30
-	lsls r0, r0, #8
-	str r0, [r1, #0x14]
-	movs r0, #0xfd
-	lsls r0, r0, #8
-	strh r0, [r1, #0x1a]
-	lsls r0, r3, #0x18
-	asrs r2, r0, #0x18
-	adds r3, r0, #0
-	cmp r2, #0
-	bge _0805D036
-	movs r4, #0x18
-	ldrsh r0, [r1, r4]
-	cmp r0, #0
-	blt _0805D042
-_0805D036:
-	cmp r2, #0
-	ble _0805D052
-	movs r2, #0x18
-	ldrsh r0, [r1, r2]
-	cmp r0, #0
-	ble _0805D052
-_0805D042:
-	cmp r3, #0
-	bge _0805D04C
-	movs r0, #0xfd
-	lsls r0, r0, #8
-	b _0805D050
-_0805D04C:
-	movs r0, #0xc0
-	lsls r0, r0, #2
-_0805D050:
-	strh r0, [r1, #0x18]
-_0805D052:
-	pop {r4}
-	pop {r0}
-	bx r0
-
-	thumb_func_start sub_805D058
-sub_805D058: @ 0x0805D058
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	adds r5, #0x18
-	ldr r2, [r0, #0xc]
-	asrs r2, r2, #8
-	ldrh r1, [r0, #6]
-	lsls r1, r1, #8
-	adds r2, r2, r1
-	ldr r3, _0805D098 @ =gCamera
-	ldr r1, [r3]
-	subs r2, r2, r1
-	strh r2, [r5, #0x10]
-	ldr r1, [r0, #0x10]
-	asrs r1, r1, #8
-	ldrh r0, [r0, #8]
-	lsls r0, r0, #8
-	adds r1, r1, r0
-	ldr r0, [r3, #4]
-	subs r1, r1, r0
-	strh r1, [r5, #0x12]
-	adds r0, r5, #0
-	bl UpdateSpriteAnimation
-	adds r4, r0, #0
-	adds r0, r5, #0
-	bl DisplaySprite
-	adds r0, r4, #0
-	pop {r4, r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805D098: .4byte gCamera
-
-	thumb_func_start TaskDestructor_805D09C
-TaskDestructor_805D09C: @ 0x0805D09C
-	push {lr}
-	ldrh r0, [r0, #6]
-	movs r1, #0xc0
-	lsls r1, r1, #0x12
-	adds r0, r0, r1
-	ldr r0, [r0, #0x18]
-	bl VramFree
-	pop {r0}
-	bx r0

ldscript.txt

@@ -131,7 +131,6 @@ SECTIONS {
         src/game/enemies/takkon.o(.text);
         src/game/enemies/jousun.o(.text);
         src/game/enemies/enemy_unknown_code.o(.text);
-        asm/enemy_unknown_code.o(.text);
         src/game/enemies/uutsubo.o(.text);
         src/game/enemies/gaogao.o(.text);
         src/game/enemies/juggling.o(.text);

src/game/enemies/enemy_unknown_code.c

@@ -40,7 +40,7 @@ void Task_14_805C03C(void);
 void sub_805C138(EUC_Strc40 *arg0);
 void Task_40_805C198(void);
 void TaskDestructor_805C03C(struct Task *t);
-bool32 sub_805CF90(s16 worldX, s16 worldY, s16 spriteX, s16 spriteY);
+bool32 sub_805CF90(s32 worldX, s32 worldY, s32 spriteX, s32 spriteY);
 void sub_805CB70(Player *p, Sprite *s, u32 collision, s32 x, UNUSED s32 y, s8 dir);
 void sub_805CC5C(Player *p, Sprite *s, s32 collision, s32 x, u32 y, s8 dir);
 void sub_805CFE8(Player *p, Sprite *s, s32 collision, s32 x, u32 y, s8 dir);
@@ -742,46 +742,52 @@ void sub_805CF38(s32 qWorldX, s32 qWorldY, u16 regionX, u16 regionY, Player *p)
 
 void TaskDestructor_805C03C(Task *arg0) { }
 
-#if 0
-s32 sub_805CF90(s16 arg0, s16 arg1, s16 arg2, s32 arg3) {
-    s32 temp_r4;
-
-    temp_r4 = arg1 - gCamera.y;
-    if ((((u32) ((arg0 - gCamera.x) + 0x80) > 0x1F0U) || ((s32) (temp_r4 + 0x80) < 0) || (temp_r4 > 0x120)) && (((u32) (arg2 + 0x80) > 0x1F0U) || ((s32) (arg3 + 0x80) < 0) || (arg3 > 0x120))) {
-        return 0;
+bool32 sub_805CF90(s32 worldX, s32 worldY, s32 spriteX, s32 spriteY)
+{
+    worldX -= gCamera.x;
+    worldY -= gCamera.y;
+
+    // TODO: Cam-range macro
+    if ((((u32)(worldX + (CAM_REGION_WIDTH / 2)) > (DISPLAY_WIDTH + 256)) || ((s32)(worldY + (CAM_REGION_WIDTH / 2)) < 0)
+         || (worldY > (DISPLAY_HEIGHT + 128)))
+        && (((u32)(spriteX + (CAM_REGION_WIDTH / 2)) > (DISPLAY_WIDTH + 256)) || ((s32)(spriteY + (CAM_REGION_WIDTH / 2)) < 0)
+            || ((s32)spriteY > (DISPLAY_HEIGHT + 128)))) {
+        return FALSE;
     }
-    return 1;
+    return TRUE;
 }
 
-void sub_805CFE8(Player *arg0, s32 arg2, u32 arg4, s32 arg5) {
-    s16 var_r0;
-    s8 temp_r2;
-    u8 temp_r3;
+void sub_805CFE8(Player *p, Sprite *s, s32 collision, s32 x, u32 y, s8 dir)
+{
+    if (((0x10000 & collision) && (p->qSpeedAirY < 0)) || ((0x20000 & collision) && (p->qSpeedAirY > 0))) {
+        p->qWorldY = Q(y - 48);
+        p->qSpeedAirY = -Q(3);
 
-    temp_r3 = (u8) arg5;
-    if ((((0x10000 & arg2) && ((s32) arg0->qSpeedAirY < 0)) || ((0x20000 & arg2) && ((s32) arg0->qSpeedAirY > 0))) && (((arg0->qWorldY = (arg4 - 0x30) << 8, arg0->qSpeedAirY = -0x300, temp_r2 = (s8) temp_r3, ((s32) temp_r2 < 0)) && ((s32) arg0->qSpeedAirX < 0)) || (((s32) temp_r2 > 0) && ((s32) arg0->qSpeedAirX > 0)))) {
-        if ((s32) (temp_r3 << 0x18) < 0) {
-            var_r0 = -0x300;
-        } else {
-            var_r0 = +0x300;
+        if (((dir < 0) && (p->qSpeedAirX < 0)) || ((dir > 0) && (p->qSpeedAirX > 0))) {
+            if (dir < 0) {
+                p->qSpeedAirX = -Q(3);
+            } else {
+                p->qSpeedAirX = +Q(3);
+            }
         }
-        arg0->qSpeedAirX = var_r0;
     }
 }
 
-s32 sub_805D058(void *arg0) {
-    Sprite *temp_r5;
-    s32 temp_r4;
-
-    temp_r5 = arg0 + 0x18;
-    temp_r5->x = (((s32) arg0->unkC >> 8) + (arg0->unk6 << 8)) - gCamera.x;
-    temp_r5->y = (((s32) arg0->unk10 >> 8) + (arg0->unk8 << 8)) - gCamera.y;
-    temp_r4 = UpdateSpriteAnimation(temp_r5);
-    DisplaySprite(temp_r5);
-    return temp_r4;
+AnimCmdResult sub_805D058(EUC_Strc40 *strc40)
+{
+    Sprite *s;
+    s32 acmdRes;
+
+    s = &strc40->s;
+    s->x = TO_WORLD_POS_RAW(I(strc40->qWorldX), strc40->regionX) - gCamera.x;
+    s->y = TO_WORLD_POS_RAW(I(strc40->qWorldY), strc40->regionY) - gCamera.y;
+    acmdRes = UpdateSpriteAnimation(s);
+    DisplaySprite(s);
+    return acmdRes;
 }
 
-void TaskDestructor_805D09C(Task *arg0) {
-    VramFree(arg0->data->unk18);
+void TaskDestructor_805D09C(Task *t)
+{
+    EUC_Strc40 *strc = TASK_DATA(t);
+    VramFree(strc->s.tiles);
 }
-#endif