sub_805E174

3 files changed, 86 insertions, 171 deletions

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index ee600d59d..c3b867525 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -5,148 +5,6 @@
 	.syntax unified
 
 	.text
-	thumb_func_start sub_805E174
-sub_805E174: @ 805E174
-	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, _0805E190 @ =gMapObjects
-	adds r0, r2
-	ldr r2, _0805E194 @ =sub_805E198
-	bl meta_step
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805E190: .4byte gMapObjects
-_0805E194: .4byte sub_805E198
-	thumb_func_end sub_805E174
-
-	thumb_func_start sub_805E198
-sub_805E198: @ 805E198
-	push {r4,lr}
-	ldr r3, _0805E1B4 @ =gUnknown_083753CC
-	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
-_0805E1B4: .4byte gUnknown_083753CC
-	thumb_func_end sub_805E198
-
-	thumb_func_start sub_805E1B8
-sub_805E1B8: @ 805E1B8
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl npc_reset
-	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, 0x1
-	strh r0, [r5, 0x30]
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805E1B8
-
-	thumb_func_start sub_805E1E4
-sub_805E1E4: @ 805E1E4
-	push {r4,lr}
-	adds r4, r1, 0
-	bl FieldObjectExecRegularAnim
-	lsls r0, 24
-	cmp r0, 0
-	beq _0805E1FE
-	adds r0, r4, 0
-	movs r1, 0x30
-	bl sub_8064820
-	movs r0, 0x2
-	strh r0, [r4, 0x30]
-_0805E1FE:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805E1E4
-
-	thumb_func_start sub_805E208
-sub_805E208: @ 805E208
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r0, r5, 0
-	bl sub_8064824
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805E226
-	adds r0, r4, 0
-	bl FieldObjectIsTrainerAndCloseToPlayer
-	lsls r0, 24
-	cmp r0, 0
-	beq _0805E22A
-_0805E226:
-	movs r0, 0x3
-	strh r0, [r5, 0x30]
-_0805E22A:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805E208
-
-	thumb_func_start sub_805E234
-sub_805E234: @ 805E234
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldr r1, _0805E274 @ =gUnknown_083753DC
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_805CD60
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	bne _0805E260
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	add r0, sp
-	ldrb r1, [r0]
-_0805E260:
-	adds r0, r4, 0
-	bl FieldObjectSetDirection
-	movs r0, 0
-	strh r0, [r5, 0x30]
-	movs r0, 0x1
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805E274: .4byte gUnknown_083753DC
-	thumb_func_end sub_805E234
 
 	thumb_func_start sub_805E278
 sub_805E278: @ 805E278
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index ca0852a96..4c2d4c705 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -8,4 +8,35 @@ void FieldObjectSetDirection(struct MapObject *pObject, u8 unk_18);
 void MoveCoords(u8 direction, s16 *x, s16 *y);
 void meta_step(struct MapObject *pObject,  struct Sprite *pSprite,  u8 (*d8)());
 
+extern const u8 gUnknown_08375240[4];
+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 const u8 gUnknown_083752A0[2];
+extern u8 (*const gUnknown_083752A4[])(struct MapObject *mapObject, struct Sprite *sprite);
+extern const u8 gUnknown_083752C0[2];
+extern u8 (*const gUnknown_083752C4[])(struct MapObject *mapObject, struct Sprite *sprite);
+extern u8 (*const gUnknown_083752D0[])(struct MapObject *mapObject, struct Sprite *sprite);
+extern u8 (*const gUnknown_083752E4[])(struct MapObject *mapObject, struct Sprite *sprite);
+extern u8 (*const gUnknown_083752F8[])(struct MapObject *mapObject, struct Sprite *sprite);
+extern u8 (*const gUnknown_0837530C[])(struct MapObject *mapObject, struct Sprite *sprite);
+extern const u8 gUnknown_08375320[2];
+extern u8 (*const gUnknown_08375324[])(struct MapObject *mapObject, struct Sprite *sprite);
+extern const u8 gUnknown_08375338[2];
+extern u8 (*const gUnknown_0837533C[])(struct MapObject *mapObject, struct Sprite *sprite);
+extern const u8 gUnknown_08375350[2];
+extern u8 (*const gUnknown_08375354[])(struct MapObject *mapObject, struct Sprite *sprite);
+extern const u8 gUnknown_08375368[2];
+extern u8 (*const gUnknown_0837536C[])(struct MapObject *mapObject, struct Sprite *sprite);
+extern const u8 gUnknown_08375380[2];
+extern u8 (*const gUnknown_08375384[])(struct MapObject *mapObject, struct Sprite *sprite);
+extern const u8 gUnknown_08375398[2];
+extern u8 (*const gUnknown_0837539C[])(struct MapObject *mapObject, struct Sprite *sprite);
+extern const u8 gUnknown_083753B0[2];
+extern u8 (*const gUnknown_083753B4[])(struct MapObject *mapObject, struct Sprite *sprite);
+extern const u8 gUnknown_083753C8[2];
+extern u8 (*const gUnknown_083753CC[])(struct MapObject *mapObject, struct Sprite *sprite);
+extern const u8 gUnknown_083753DC[5];
+
 #endif // GUARD_FIELD_MAP_OBJ_H
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 394f3c43d..475620c28 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -35,22 +35,6 @@ void GetFieldObjectMovingCameraOffset(s16 *, s16 *);
 void sub_805BDF8(u16);
 u8 sub_805BE58(const struct SpritePalette *);
 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);
-extern u8 (*const gUnknown_083752C4[])(struct MapObject *mapObject, struct Sprite *sprite);
-extern u8 (*const gUnknown_083752D0[])(struct MapObject *mapObject, struct Sprite *sprite);
-extern u8 (*const gUnknown_083752E4[])(struct MapObject *mapObject, struct Sprite *sprite);
-extern u8 (*const gUnknown_083752F8[])(struct MapObject *mapObject, struct Sprite *sprite);
-extern u8 (*const gUnknown_0837530C[])(struct MapObject *mapObject, struct Sprite *sprite);
-extern u8 (*const gUnknown_08375324[])(struct MapObject *mapObject, struct Sprite *sprite);
-extern u8 (*const gUnknown_0837533C[])(struct MapObject *mapObject, struct Sprite *sprite);
-extern u8 (*const gUnknown_08375354[])(struct MapObject *mapObject, struct Sprite *sprite);
-extern u8 (*const gUnknown_0837536C[])(struct MapObject *mapObject, struct Sprite *sprite);
-extern u8 (*const gUnknown_08375384[])(struct MapObject *mapObject, struct Sprite *sprite);
-extern u8 (*const gUnknown_0837539C[])(struct MapObject *mapObject, struct Sprite *sprite);
-extern u8 (*const gUnknown_083753B4[])(struct MapObject *mapObject, struct Sprite *sprite);
 
 struct PairedPalettes
 {
@@ -1593,17 +1577,6 @@ u8 sub_805C96C(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-extern const u8 gUnknown_08375240[4];
-extern const u8 gUnknown_083752A0[2];
-extern const u8 gUnknown_083752C0[2];
-extern const u8 gUnknown_08375320[2];
-extern const u8 gUnknown_08375338[2];
-extern const u8 gUnknown_08375350[2];
-extern const u8 gUnknown_08375368[2];
-extern const u8 gUnknown_08375380[2];
-extern const u8 gUnknown_08375398[2];
-extern const u8 gUnknown_083753B0[2];
-extern const u8 gUnknown_083753C8[2];
 extern u8 sub_805FF20(struct MapObject *, u8);
 
 u8 sub_805C98C(struct MapObject *mapObject, struct Sprite *sprite)
@@ -2744,7 +2717,6 @@ u8 sub_805DEAC(struct MapObject *mapObject, struct Sprite *sprite)
     return 1;
 }
 
-
 u8 sub_805DF18(struct MapObject *mapObject, struct Sprite *sprite);
 
 void sub_805DEF4(struct Sprite *sprite)
@@ -2870,7 +2842,61 @@ u8 sub_805E12C(struct MapObject *mapObject, struct Sprite *sprite)
     return 1;
 }
 
-void sub_805E174(struct Sprite *sprite);
+
+u8 sub_805E198(struct MapObject *mapObject, struct Sprite *sprite);
+
+void sub_805E174(struct Sprite *sprite)
+{
+    meta_step(&gMapObjects[sprite->data0], sprite, sub_805E198);
+}
+
+u8 sub_805E198(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    return gUnknown_083753CC[sprite->data1](mapObject, sprite);
+}
+
+u8 sub_805E1B8(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    npc_reset(mapObject, sprite);
+    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
+    sprite->data1 = 1;
+    return 1;
+}
+
+u8 sub_805E1E4(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    {
+        sub_8064820(sprite, 0x30);
+        sprite->data1 = 2;
+    }
+    return 0;
+}
+
+u8 sub_805E208(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    {
+        sprite->data1 = 3;
+    }
+    return 0;
+}
+
+u8 sub_805E234(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[5];
+    memcpy(directions, gUnknown_083753DC, 5);
+    direction = sub_805CD60(mapObject, 0);
+    if (direction == 0)
+    {
+        direction = directions[mapObject->mapobj_unk_18];
+    }
+    FieldObjectSetDirection(mapObject, direction);
+    sprite->data1 = 0;
+    return 1;
+}
+
 void sub_805E278(struct Sprite *sprite);
 void sub_805E37C(struct Sprite *sprite);
 void sub_805E5DC(struct Sprite *sprite);