diff options
| -rw-r--r-- | include/field_map_obj.h | 23 | ||||
| -rw-r--r-- | src/field_map_obj.c | 23 | ||||
| -rw-r--r-- | src/field_player_avatar.c | 12 |
3 files changed, 24 insertions, 34 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 4f9b6f5af..00fda8358 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -3,6 +3,29 @@ #include "sprite.h" +#define fieldmap_object_cb(setup, callback, table) \ +extern u8 (*const table[])(struct MapObject *, struct Sprite *);\ +static u8 callback(struct MapObject *, struct Sprite *);\ +void setup(struct Sprite *sprite)\ +{\ + meta_step(&gMapObjects[sprite->data0], sprite, callback);\ +}\ +static u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\ +{\ + return table[sprite->data1](mapObject, sprite);\ +} + +#define fieldmap_object_null_cb(setup, callback) \ +static u8 callback(struct MapObject *, struct Sprite *);\ +void setup(struct Sprite *sprite)\ +{\ + meta_step(&gMapObjects[sprite->data0], sprite, callback);\ +}\ +static u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\ +{\ + return 0;\ +} + void sub_805C058(struct MapObject *mapObject, s16 a, s16 b); void FieldObjectSetDirection(struct MapObject *pObject, u8 unk_18); void MoveCoords(u8 direction, s16 *x, s16 *y); diff --git a/src/field_map_obj.c b/src/field_map_obj.c index 2c949c191..b75f16d54 100644 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -12,29 +12,6 @@ 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); diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 71ff40435..13c1cd277 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -27,7 +27,6 @@ extern u8 gOtherText_ItGotAway[]; extern u32 gUnknown_0202FF84[]; //Functions -static u8 sub_80587D8(void); static bool8 sub_8058854(struct MapObject *, u8); static void npc_clear_strange_bits(struct MapObject *a); static void MovePlayerAvatarUsingKeypadInput(u8 a, u16 b, u16 c); @@ -246,16 +245,7 @@ static u8 (*const gUnknown_0830FC98[])(struct Task *, struct MapObject *) = sub_805A1B8, }; - -void sub_80587B4(struct Sprite *sprite) -{ - meta_step(&gMapObjects[sprite->data0], sprite, sub_80587D8); -} - -static u8 sub_80587D8(void) -{ - return 0; -} +fieldmap_object_null_cb(sub_80587B4, sub_80587D8); void player_step(u8 direction, u16 newKeys, u16 heldKeys) { |