diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
| commit | f719abf104e304ed2f886a413d1132a75e3379b1 (patch) | |
| tree | 352be6d36f1db3f697394bc193adb7fa8142be71 /include/field_map_obj.h | |
| parent | 2d604191592fbac2618d4a626f61ff1423cac828 (diff) | |
| parent | bd4a6520eaaaac186b6b26557305be8939a7ea2a (diff) | |
fix merge conflicts
Diffstat (limited to 'include/field_map_obj.h')
| -rw-r--r--[-rwxr-xr-x] | include/field_map_obj.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h index d051ea097..6595a51ca 100755..100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -426,5 +426,8 @@ u8 sub_8060B38(u8); u8 sub_8060B64(u8); u8 GetOppositeDirection(u8); void sub_80634D0(struct MapObject *, struct Sprite *); +u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8); +void CameraObjectSetFollowedObjectId(u8); +u8 sub_805ADDC(u8); #endif // GUARD_FIELD_MAP_OBJ_H |