sub_805D0AC and helpers

2 files changed, 84 insertions, 216 deletions

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 75f4abb55..bbd6a4c36 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -6,221 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_805D0AC
-sub_805D0AC: @ 805D0AC
-	push {lr}
-	adds r1, r0, 0
-	movs r0, 0x2E
-	ldrsh r2, [r1, r0]
-	lsls r0, r2, 3
-	adds r0, r2
-	lsls r0, 2
-	ldr r2, _0805D0C8 @ =gMapObjects
-	adds r0, r2
-	ldr r2, _0805D0CC @ =sub_805D0D0
-	bl meta_step
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805D0C8: .4byte gMapObjects
-_0805D0CC: .4byte sub_805D0D0
-	thumb_func_end sub_805D0AC
-
-	thumb_func_start sub_805D0D0
-sub_805D0D0: @ 805D0D0
-	push {r4,lr}
-	ldr r3, _0805D0EC @ =gUnknown_083752A4
-	movs r4, 0x30
-	ldrsh r2, [r1, r4]
-	lsls r2, 2
-	adds r2, r3
-	ldr r2, [r2]
-	bl _call_via_r2
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805D0EC: .4byte gUnknown_083752A4
-	thumb_func_end sub_805D0D0
-
-	thumb_func_start sub_805D0F0
-sub_805D0F0: @ 805D0F0
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_reset
-	movs r0, 0x1
-	strh r0, [r4, 0x30]
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805D0F0
-
-	thumb_func_start sub_805D104
-sub_805D104: @ 805D104
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetFaceDirectionAnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetRegularAnim
-	movs r0, 0x2
-	strh r0, [r5, 0x30]
-	movs r0, 0x1
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805D104
-
-	thumb_func_start sub_805D130
-sub_805D130: @ 805D130
-	push {r4-r6,lr}
-	adds r6, r1, 0
-	bl FieldObjectExecRegularAnim
-	lsls r0, 24
-	cmp r0, 0
-	beq _0805D164
-	ldr r5, _0805D160 @ =gUnknown_0837520C
-	bl Random
-	movs r4, 0x3
-	adds r1, r4, 0
-	ands r1, r0
-	lsls r1, 1
-	adds r1, r5
-	movs r0, 0
-	ldrsh r1, [r1, r0]
-	adds r0, r6, 0
-	bl sub_8064820
-	strh r4, [r6, 0x30]
-	movs r0, 0x1
-	b _0805D166
-	.align 2, 0
-_0805D160: .4byte gUnknown_0837520C
-_0805D164:
-	movs r0, 0
-_0805D166:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805D130
-
-	thumb_func_start sub_805D16C
-sub_805D16C: @ 805D16C
-	push {r4,lr}
-	adds r4, r1, 0
-	adds r0, r4, 0
-	bl sub_8064824
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805D180
-	movs r0, 0
-	b _0805D186
-_0805D180:
-	movs r0, 0x4
-	strh r0, [r4, 0x30]
-	movs r0, 0x1
-_0805D186:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805D16C
-
-	thumb_func_start sub_805D18C
-sub_805D18C: @ 805D18C
-	push {r4-r7,lr}
-	sub sp, 0x4
-	adds r5, r0, 0
-	adds r6, r1, 0
-	ldr r1, _0805D1D4 @ =gUnknown_083752C0
-	mov r0, sp
-	movs r2, 0x2
-	bl memcpy
-	bl Random
-	movs r7, 0x1
-	adds r1, r7, 0
-	ands r1, r0
-	mov r2, sp
-	adds r0, r2, r1
-	ldrb r4, [r0]
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl FieldObjectSetDirection
-	movs r0, 0x5
-	strh r0, [r6, 0x30]
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl sub_805FF20
-	lsls r0, 24
-	cmp r0, 0
-	beq _0805D1CA
-	strh r7, [r6, 0x30]
-_0805D1CA:
-	movs r0, 0x1
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805D1D4: .4byte gUnknown_083752C0
-	thumb_func_end sub_805D18C
-
-	thumb_func_start sub_805D1D8
-sub_805D1D8: @ 805D1D8
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4, 0x18]
-	lsrs r0, 4
-	bl GetGoSpeed0AnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetRegularAnim
-	ldrb r0, [r4]
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r4]
-	movs r0, 0x6
-	strh r0, [r5, 0x30]
-	movs r0, 0x1
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805D1D8
-
-	thumb_func_start sub_805D208
-sub_805D208: @ 805D208
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl FieldObjectExecRegularAnim
-	lsls r0, 24
-	cmp r0, 0
-	beq _0805D226
-	ldrb r0, [r4]
-	movs r1, 0x3
-	negs r1, r1
-	ands r1, r0
-	strb r1, [r4]
-	movs r0, 0x1
-	strh r0, [r5, 0x30]
-_0805D226:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805D208
-
 	thumb_func_start sub_805D230
 sub_805D230: @ 805D230
 	push {lr}
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 84d3d1f01..4de55e0af 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -37,6 +37,7 @@ u8 FindFieldObjectPaletteIndexByTag(u16);
 extern u8 (*const gUnknown_08375244[])(s16 a0, s16 a1, s16 a2, s16 a3);
 extern u8 (*const gUnknown_08375270[])(struct MapObject *mapObject, struct Sprite *sprite);
 extern u8 (*const gUnknown_08375284[])(struct MapObject *mapObject, struct Sprite *sprite);
+extern u8 (*const gUnknown_083752A4[])(struct MapObject *mapObject, struct Sprite *sprite);
 
 struct PairedPalettes
 {
@@ -1578,8 +1579,9 @@ u8 sub_805C96C(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-extern const u8 gUnknown_083752A0[2];
 extern const u8 gUnknown_08375240[4];
+extern const u8 gUnknown_083752A0[2];
+extern const u8 gUnknown_083752C0[2];
 extern u8 sub_805FF20(struct MapObject *, u8);
 
 u8 sub_805C98C(struct MapObject *mapObject, struct Sprite *sprite)
@@ -1993,3 +1995,84 @@ u8 sub_805D084(struct MapObject *mapObject, struct Sprite *sprite)
     }
     return 0;
 }
+
+u8 sub_805D0D0(struct MapObject *mapObject, struct Sprite *sprite);
+
+void sub_805D0AC(struct Sprite *sprite)
+{
+    meta_step(&gMapObjects[sprite->data0], sprite, sub_805D0D0);
+}
+
+u8 sub_805D0D0(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    return gUnknown_083752A4[sprite->data1](mapObject, sprite);
+}
+
+u8 sub_805D0F0(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    npc_reset(mapObject, sprite);
+    sprite->data1 = 1;
+    return 1;
+}
+
+u8 sub_805D104(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
+    sprite->data1 = 2;
+    return 1;
+}
+
+u8 sub_805D130(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    if (FieldObjectExecRegularAnim(mapObject, sprite) == 0)
+    {
+        return 0;
+    }
+    sub_8064820(sprite, gUnknown_0837520C[Random() & 3]);
+    sprite->data1 = 3;
+    return 1;
+}
+
+u8 sub_805D16C(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    if (sub_8064824(sprite) != 0)
+    {
+        sprite->data1 = 4;
+        return 1;
+    }
+    return 0;
+}
+
+u8 sub_805D18C(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[2];
+    memcpy(directions, gUnknown_083752C0, 2);
+    direction = directions[Random() & 1];
+    FieldObjectSetDirection(mapObject, direction);
+    sprite->data1 = 5;
+    if (sub_805FF20(mapObject, direction) != 0)
+    {
+        sprite->data1 = 1;
+    }
+    return 1;
+}
+
+u8 sub_805D1D8(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18));
+    mapObject->mapobj_bit_1 = 1;
+    sprite->data1 = 6;
+    return 1;
+}
+
+u8 sub_805D208(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    if (FieldObjectExecRegularAnim(mapObject, sprite) != 0)
+    {
+        mapObject->mapobj_bit_1 = 0;
+        sprite->data1 = 1;
+    }
+    return 0;
+}
+