summaryrefslogtreecommitdiff
path: root/include/field_map_obj.h
diff options
context:
space:
mode:
authorPaul Sander <nintendo6496@googlemail.com>2018-11-30 22:16:04 +0100
committerPaul Sander <nintendo6496@googlemail.com>2018-11-30 22:16:04 +0100
commitfc1fd9c983b0ea35414f699ab6c4b4fdd617e8d0 (patch)
treed1972ab6d6b1ad9ab93bf5bde673a722a3a9f2c7 /include/field_map_obj.h
parent308e60da31388973ac8885127b12db300e21100a (diff)
parent63c205e7d0094756ea851e0aed0852671329905c (diff)
merge upstream
Diffstat (limited to 'include/field_map_obj.h')
-rw-r--r--include/field_map_obj.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index ded970a83..d2ec58979 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -86,6 +86,8 @@ void npc_set_running_behaviour_etc(struct MapObject *, u8);
u8 sub_80634F0(u8 direction);
u8 sub_8063500(u8 a0);
void sub_805F060(struct MapObject *mapObject, u8 a1);
+u8 sub_805EB44(u8, u8, s16, s16);
+void npc_paltag_set_load(u8 mode);
// Exported data declarations