diff options
| author | Made-s <made111@gmx.de> | 2018-01-06 19:09:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 19:09:47 +0100 |
| commit | 8906ac68e7c5caf7c62597abf16affafc2bb05a3 (patch) | |
| tree | 3c523aa3c85e1d112f06b34283ddc076d0916891 /include/field_map_obj.h | |
| parent | f813e926e6438c04167a563225b9fca0939fa758 (diff) | |
| parent | b396c6038cec6eba5eed46ed8f70f6a465acc2a6 (diff) | |
Merge branch 'master' into master
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); |