Merge branch 'master' of https://github.com/pret/pokeemerald into intro

1 files changed, 9 insertions, 0 deletions

diff --git a/include/field_camera.h b/include/field_camera.h
index 6daa9a8a2..6ff8ce006 100644
--- a/include/field_camera.h
+++ b/include/field_camera.h
@@ -26,5 +26,14 @@ void DrawWholeMapView(void);
 void CurrentMapDrawMetatileAt(int x, int y);
 void sub_8089C08(s16 *a0, s16 *a1);
 void DrawDoorMetatileAt(int x, int y, u16 *arr);
+void move_tilemap_camera_to_upper_left_corner(void);
+void sub_8057A58(void);
+void ResetCameraUpdateInfo(void);
+u32 InitCameraUpdateCallback(u8 a);
+void CameraUpdate(void);
+void SetCameraPanningCallback(void (*a)(void));
+void SetCameraPanning(s16 a, s16 b);
+void InstallCameraPanAheadCallback(void);
+void UpdateCameraPanning(void);
 
 #endif //GUARD_FIELD_CAMERA_H