diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-06 13:46:46 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-06 13:46:46 +0100 |
| commit | a9e39c0919ccbd0fc9dac0a60f3a1a206f9249f5 (patch) | |
| tree | baf1dbf232ad81f906c9805ce5986f850c0b84a9 /include/field_map_obj.h | |
| parent | 6fae3c9b75221ac611871fe5ec4bca057f6f79a2 (diff) | |
| parent | 818dfa314e1658ab797af686fedd464c9fda6557 (diff) | |
Merge branch 'master' into battle_anim
Diffstat (limited to 'include/field_map_obj.h')
| -rw-r--r-- | include/field_map_obj.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h index f0b0bb5ab..cf3be36b2 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -337,7 +337,7 @@ void RemoveFieldObjectInternal(struct MapObject *); u8 SpawnSpecialFieldObject(struct MapObjectTemplate *); u8 show_sprite(u8, u8, u8); void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables); -u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 c, s16 d, u8 subpriority); +u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority); u8 sub_805B410(u8, u8, s16, s16, u8, u8); void sub_805B55C(s16 a, s16 b); void sub_805B710(u16 i, u16 i1); |