summaryrefslogtreecommitdiff
path: root/include/field_map_obj.h
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-09-29 20:05:01 -0700
committerGitHub <noreply@github.com>2017-09-29 20:05:01 -0700
commit13f16b577935635546698aca88b3d1780cbc4991 (patch)
tree30b1690824dd0486b0e7abe84f56b17aad799b87 /include/field_map_obj.h
parentcf0bf8a1f2d3cd97e0fe967270188dda24b8fac2 (diff)
parentb3477c99c6d53c02ed38c2a0fcd02fd5c8d5278d (diff)
Merge pull request #431 from PikalaxALT/field_effect_helpers
Field effect helpers
Diffstat (limited to 'include/field_map_obj.h')
-rw-r--r--include/field_map_obj.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index d2a1a9b1f..af52591b0 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -3,6 +3,8 @@
#include "sprite.h"
+extern const u8 gUnknown_0830FD14[];
+
#define fieldmap_object_cb(setup, callback, table) \
static u8 callback(struct MapObject *, struct Sprite *);\
void setup(struct Sprite *sprite)\
@@ -427,5 +429,8 @@ void sub_80634D0(struct MapObject *, struct Sprite *);
u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
void CameraObjectSetFollowedObjectId(u8);
u8 sub_805ADDC(u8);
+u8 obj_unfreeze(struct Sprite *, s16, s16, u8);
+u16 npc_paltag_by_palslot(u8);
+void sub_8060470(s16 *, s16 *, s16, s16);
#endif // GUARD_FIELD_MAP_OBJ_H