Merge branch 'master' into event_object_movement

2020-03-13 00:32:04 -07:00
parent 339c2914af 6af8c04d8f
commit 99e4de062a
3241 changed files with 80742 additions and 133435 deletions
@@ -8,9 +8,9 @@
 struct CameraObject
 {
    void (*callback)(struct CameraObject *);
-    u32 unk4;
-    s32 unk8;
-    s32 unkC;
+    u32 spriteId;
+    s32 movementSpeedX;
+    s32 movementSpeedY;
    s32 x;
    s32 y;
 };
@@ -28,6 +28,7 @@ void CurrentMapDrawMetatileAt(int x, int y);
 void sub_805A658(s16 *x, s16 *y);
 void SetCameraPanningCallback(void (*cb)(void));
 void SetCameraPanning(s16 x, s16 y);
+void UpdateCameraPanning(void);
 void InstallCameraPanAheadCallback(void);
 void DrawDoorMetatileAt(int x, int y, const u16 *data);