diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-06-10 20:20:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-10 20:20:24 -0400 |
| commit | 03e47515e153e7c8757bdb28de87f149d5022a82 (patch) | |
| tree | 0ce0660fb0c4d3edc3bc21970357b506ff15dd49 /include/field_map_obj.h | |
| parent | 19c9e0851a971061b3f9e7b7840cdd59ab538f72 (diff) | |
| parent | 731b5e103a535086ebf99a2c3a032a7b0e30e74f (diff) | |
Merge pull request #62 from jiangzhengwenjz/teachy_tv
teachy_tv
Diffstat (limited to 'include/field_map_obj.h')
| -rw-r--r-- | include/field_map_obj.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 459122d32..27a7f23d7 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -46,7 +46,7 @@ void FieldObjectClearAnim(struct MapObject *); void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *); void SpawnFieldObjectsInView(s16, s16); u8 sprite_new(u8, u8, s16, s16, u8, u8); -u8 AddPseudoFieldObject(u16, void (*)(struct Sprite *), s16, s16, u8); +u8 AddPseudoEventObject(u16, SpriteCallback, s16, s16, u8); u8 show_sprite(u8, u8, u8); u8 SpawnSpecialFieldObjectParameterized(u8, u8, u8, s16, s16, u8); u8 SpawnSpecialFieldObject(struct MapObjectTemplate *); @@ -92,5 +92,7 @@ void npc_paltag_set_load(u8 mode); // Exported data declarations extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; +extern const struct SpritePalette gUnknown_83A5348; +extern const struct SpriteTemplate * const gUnknown_83A0010[]; #endif //GUARD_FIELD_MAP_OBJ_H |