diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-05 22:39:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 22:39:18 -0600 |
| commit | f3399955b15f622aec629dbd9bee3090a69e2ce0 (patch) | |
| tree | 4b47c9fb0f2db74dcbc56cedec839523c86a5647 /include/field_map_obj.h | |
| parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) | |
| parent | e95436b9024f2c32a2a005c97cf35f426fadab62 (diff) | |
Merge pull request #504 from camthesaxman/decompile_easy_chat
decompile easy_chat.s
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); |