1 files changed, 85 insertions, 199 deletions

diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 475620c28..2c949c191 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -12,6 +12,30 @@
 
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[36];
 
+#define fieldmap_object_cb(setup, callback, table) \
+extern u8 (*const table[])(struct MapObject *, struct Sprite *);\
+u8 callback(struct MapObject *, struct Sprite *);\
+void setup(struct Sprite *sprite)\
+{\
+    meta_step(&gMapObjects[sprite->data0], sprite, callback);\
+}\
+u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\
+{\
+    return table[sprite->data1](mapObject, sprite);\
+}
+
+#define fieldmap_object_null_cb(setup, callback) \
+u8 callback(struct MapObject *, struct Sprite *);\
+void setup(struct Sprite *sprite)\
+{\
+    meta_step(&gMapObjects[sprite->data0], sprite, callback);\
+}\
+u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\
+{\
+    return 0;\
+}
+
+
 extern void strange_npc_table_clear(void);
 extern void ClearPlayerAvatarInfo(void);
 extern void npc_load_two_palettes__no_record(u16, u8);
@@ -1505,33 +1529,8 @@ u16 npc_paltag_by_palslot(u8 a)
     return 0x11FF;
 }
 
-u8 sub_805C8A8(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805C884(struct Sprite *sprite)
-{
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805C8A8);
-}
-
-u8 sub_805C8A8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return 0;
-}
-
-u8 sub_805C8D0(struct MapObject *, struct Sprite *);
-
-void sub_805C8AC(struct Sprite *sprite)
-{
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805C8D0);
-}
-
-extern u8 (*const gUnknown_08375224[])();
-
-u8 sub_805C8D0(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return gUnknown_08375224[sprite->data1](mapObject, sprite);
-}
-
-void npc_reset(struct MapObject *mapObject, struct Sprite *sprite);
+fieldmap_object_null_cb(sub_805C884, sub_805C8A8);
+fieldmap_object_cb(sub_805C8AC, sub_805C8D0, gUnknown_08375224);
 
 u8 sub_805C8F0(struct MapObject *mapObject, struct Sprite *sprite)
 {
@@ -1849,17 +1848,7 @@ u8 sub_805CD60(struct MapObject *mapObject, u8 a1)
     return gUnknown_08375244[a1](x, y, x2, y2);
 }
 
-u8 sub_805CE0C(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805CDE8(struct Sprite *sprite)
-{
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805CE0C);
-}
-
-u8 sub_805CE0C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return gUnknown_08375270[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805CDE8, sub_805CE0c, gUnknown_08375270);
 
 u8 sub_805CE2C(struct MapObject *mapObject, struct Sprite *sprite)
 {
@@ -1911,17 +1900,7 @@ u8 sub_805CEE0(struct MapObject *mapObject, struct Sprite *sprite)
     return 1;
 }
 
-u8 sub_805CF4C(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805CF28(struct Sprite *sprite)
-{
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805CF4C);
-}
-
-u8 sub_805CF4C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return gUnknown_08375284[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805CF28, sub_805CF4C, gUnknown_08375284);
 
 u8 sub_805CF6C(struct MapObject *mapObject, struct Sprite *sprite)
 {
@@ -1991,17 +1970,7 @@ 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);
-}
+fieldmap_object_cb(sub_805D0AC, sub_805D0D0, gUnknown_083752A4);
 
 u8 sub_805D0F0(struct MapObject *mapObject, struct Sprite *sprite)
 {
@@ -2071,17 +2040,7 @@ u8 sub_805D208(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805D254(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805D230(struct Sprite *sprite)
-{
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805D254);
-}
-
-u8 sub_805D254(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return gUnknown_083752C4[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805D230, sub_805D254, gUnknown_083752C4);
 
 u8 sub_805D274(struct MapObject *mapObject, struct Sprite *sprite)
 {
@@ -2108,6 +2067,7 @@ u8 sub_805D2C0(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 u8 sub_805D314(struct MapObject *mapObject, struct Sprite *sprite);
+extern u8 (*const gUnknown_083752D0[])(struct MapObject *mapObject, struct Sprite *sprite);
 
 void FieldObjectCB_BerryTree(struct Sprite *sprite)
 {
@@ -2215,17 +2175,7 @@ u8 sub_805D4A8(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805D518(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805D4F4(struct Sprite *sprite)
-{
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805D518);
-}
-
-u8 sub_805D518(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return gUnknown_083752E4[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805D4F4, sub_805D518, gUnknown_083752E4);
 
 u8 sub_805D538(struct MapObject *mapObject, struct Sprite *sprite)
 {
@@ -2277,18 +2227,7 @@ u8 sub_805D5EC(struct MapObject *mapObject, struct Sprite *sprite)
     return 1;
 }
 
-
-u8 sub_805D658(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805D634(struct Sprite *sprite)
-{
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805D658);
-}
-
-u8 sub_805D658(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return gUnknown_083752F8[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805D634, sub_805D658, gUnknown_083752F8);
 
 u8 sub_805D678(struct MapObject *mapObject, struct Sprite *sprite)
 {
@@ -2340,18 +2279,7 @@ u8 sub_805D72C(struct MapObject *mapObject, struct Sprite *sprite)
     return 1;
 }
 
-
-u8 sub_805D798(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805D774(struct Sprite *sprite)
-{
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805D798);
-}
-
-u8 sub_805D798(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return gUnknown_0837530C[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805D774, sub_805D798, gUnknown_0837530C);
 
 u8 sub_805D7B8(struct MapObject *mapObject, struct Sprite *sprite)
 {
@@ -2403,18 +2331,7 @@ u8 sub_805D86C(struct MapObject *mapObject, struct Sprite *sprite)
     return 1;
 }
 
-
-u8 sub_805D8D8(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805D8B4(struct Sprite *sprite)
-{
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805D8D8);
-}
-
-u8 sub_805D8D8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return gUnknown_08375324[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805D8B4, sub_805D8D8, gUnknown_08375324);
 
 u8 sub_805D8F8(struct MapObject *mapObject, struct Sprite *sprite)
 {
@@ -2466,18 +2383,7 @@ u8 sub_805D9AC(struct MapObject *mapObject, struct Sprite *sprite)
     return 1;
 }
 
-
-u8 sub_805DA18(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805D9F4(struct Sprite *sprite)
-{
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805DA18);
-}
-
-u8 sub_805DA18(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return gUnknown_0837533C[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805D9F4, sub_805DA18, gUnknown_0837533C);
 
 u8 sub_805DA38(struct MapObject *mapObject, struct Sprite *sprite)
 {
@@ -2529,18 +2435,7 @@ u8 sub_805DAEC(struct MapObject *mapObject, struct Sprite *sprite)
     return 1;
 }
 
-
-u8 sub_805DB58(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805DB34(struct Sprite *sprite)
-{
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805DB58);
-}
-
-u8 sub_805DB58(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return gUnknown_08375354[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805DB34, sub_805DB58, gUnknown_08375354);
 
 u8 sub_805DB78(struct MapObject *mapObject, struct Sprite *sprite)
 {
@@ -2592,18 +2487,7 @@ u8 sub_805DC2C(struct MapObject *mapObject, struct Sprite *sprite)
     return 1;
 }
 
-
-u8 sub_805DC98(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805DC74(struct Sprite *sprite)
-{
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805DC98);
-}
-
-u8 sub_805DC98(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return gUnknown_0837536C[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805DC74, sub_805DC98, gUnknown_0837536C);
 
 u8 sub_805DCB8(struct MapObject *mapObject, struct Sprite *sprite)
 {
@@ -2655,17 +2539,7 @@ u8 sub_805DD6C(struct MapObject *mapObject, struct Sprite *sprite)
     return 1;
 }
 
-u8 sub_805DDD8(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805DDB4(struct Sprite *sprite)
-{
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805DDD8);
-}
-
-u8 sub_805DDD8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return gUnknown_08375384[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805DDB4, sub_805DDD8, gUnknown_08375384);
 
 u8 sub_805DDF8(struct MapObject *mapObject, struct Sprite *sprite)
 {
@@ -2717,17 +2591,7 @@ 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)
-{
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805DF18);
-}
-
-u8 sub_805DF18(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return gUnknown_0837539C[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805DEF4, sub_805DF18, gUnknown_0837539C);
 
 u8 sub_805DF38(struct MapObject *mapObject, struct Sprite *sprite)
 {
@@ -2779,18 +2643,7 @@ u8 sub_805DFEC(struct MapObject *mapObject, struct Sprite *sprite)
     return 1;
 }
 
-
-u8 sub_805E058(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805E034(struct Sprite *sprite)
-{
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805E058);
-}
-
-u8 sub_805E058(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return gUnknown_083753B4[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805E034, sub_805E058, gUnknown_083753B4);
 
 u8 sub_805E078(struct MapObject *mapObject, struct Sprite *sprite)
 {
@@ -2842,20 +2695,53 @@ u8 sub_805E12C(struct MapObject *mapObject, struct Sprite *sprite)
     return 1;
 }
 
+fieldmap_object_cb(sub_805E174, sub_805E198, gUnknown_083753CC);
+
+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_805E198(struct MapObject *mapObject, struct Sprite *sprite);
+u8 sub_805E1E4(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    {
+        sub_8064820(sprite, 0x30);
+        sprite->data1 = 2;
+    }
+    return 0;
+}
 
-void sub_805E174(struct Sprite *sprite)
+u8 sub_805E208(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805E198);
+    if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    {
+        sprite->data1 = 3;
+    }
+    return 0;
 }
 
-u8 sub_805E198(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_805E234(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    return gUnknown_083753CC[sprite->data1](mapObject, 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;
 }
 
-u8 sub_805E1B8(struct MapObject *mapObject, struct Sprite *sprite)
+fieldmap_object_cb(sub_805E278, sub_803E29C, gUnknown_083753E4);
+
+u8 sub_805E2BC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
@@ -2863,7 +2749,7 @@ u8 sub_805E1B8(struct MapObject *mapObject, struct Sprite *sprite)
     return 1;
 }
 
-u8 sub_805E1E4(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_805E2E8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
@@ -2873,7 +2759,7 @@ u8 sub_805E1E4(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805E208(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_805E30C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
@@ -2882,11 +2768,11 @@ u8 sub_805E208(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805E234(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_805E338(struct MapObject *mapObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[5];
-    memcpy(directions, gUnknown_083753DC, 5);
+    memcpy(directions, gUnknown_083753F4, 5);
     direction = sub_805CD60(mapObject, 0);
     if (direction == 0)
     {
@@ -2897,7 +2783,7 @@ u8 sub_805E234(struct MapObject *mapObject, struct Sprite *sprite)
     return 1;
 }
 
-void sub_805E278(struct Sprite *sprite);
+
 void sub_805E37C(struct Sprite *sprite);
 void sub_805E5DC(struct Sprite *sprite);
 void sub_805E668(struct Sprite *sprite);