diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-11 05:20:42 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-11 05:20:42 +0800 |
| commit | 20a09555eac362113abe831dd6b3973b480f56e9 (patch) | |
| tree | da95a52fd7354734ffe8157deb5f890db57011a5 /include/field_map_obj.h | |
| parent | 19f89762cf4c1d34b716428dfacd2168a979fe3c (diff) | |
fixed lots of stuff
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 d67fc476c..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 AddPseudoEventObject(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 |