1 files changed, 55 insertions, 29 deletions

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);