diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
| commit | 8cd4908fa3820b22a8b4e3d96780d725132549c4 (patch) | |
| tree | bcc8e697ce7dd0d4ab532a61fccafbbdb6d2400e /include/map_obj_8097404.h | |
| parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
merge bike with master, fix conflicts
Diffstat (limited to 'include/map_obj_8097404.h')
| -rw-r--r-- | include/map_obj_8097404.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/map_obj_8097404.h b/include/map_obj_8097404.h index 27ffd18cb..0800b15b0 100644 --- a/include/map_obj_8097404.h +++ b/include/map_obj_8097404.h @@ -28,5 +28,7 @@ void sub_8097750(struct Sprite *); bool8 sub_8097758(struct Sprite *); void sub_8097FA4(struct MapObject *); void sub_8098044(u8); +void UnfreezeMapObjects(void); +void sub_80974D0(u8 mapObjectId); #endif //GUARD_MAP_OBJ_8097404_H |