diff options
author | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
---|---|---|
committer | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
commit | 99e4de062ae43aa978ad4f1a8cd70bc739c64c9d (patch) | |
tree | 1164d31577e6ebddc1cb313d40bb69ce0d426170 /include/field_camera.h | |
parent | 339c2914affc3c62ac9a5725aa1a0c7ccc3161ca (diff) | |
parent | 6af8c04d8fa6aaeaeb6c8b919e7770a65b9a883d (diff) |
Merge branch 'master' into event_object_movement
Diffstat (limited to 'include/field_camera.h')
-rw-r--r-- | include/field_camera.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/field_camera.h b/include/field_camera.h index d76b1f8a7..2d1ce2ce9 100644 --- a/include/field_camera.h +++ b/include/field_camera.h @@ -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); |