summaryrefslogtreecommitdiff
path: root/include/field_camera.h
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-11-12 11:37:18 -0600
committerGitHub <noreply@github.com>2018-11-12 11:37:18 -0600
commit54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (patch)
tree3f1dee86f96098d38131426e11a0f9c39a1244fe /include/field_camera.h
parent65f053fd89e09b13e407ac53488043b728660e6e (diff)
parent1b895ff52c011d51a9516791148cd5088ba411b5 (diff)
Merge pull request #361 from Slawter666/synchronise
Synchronise with pokeruby
Diffstat (limited to 'include/field_camera.h')
-rw-r--r--include/field_camera.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/field_camera.h b/include/field_camera.h
index fcc19ce9a..fdc4c5450 100644
--- a/include/field_camera.h
+++ b/include/field_camera.h
@@ -7,16 +7,16 @@ struct CameraObject
{
void (*callback)(struct CameraObject *);
u32 spriteId;
- s32 unk8;
- s32 unkC;
+ s32 movementSpeedX;
+ s32 movementSpeedY;
s32 x;
s32 y;
};
// Exported RAM declarations
-extern struct CameraObject gUnknown_03005DD0;
-extern u16 gUnknown_03005DEC;
-extern u16 gUnknown_03005DE8;
+extern struct CameraObject gFieldCamera;
+extern u16 gTotalCameraPixelOffsetX;
+extern u16 gTotalCameraPixelOffsetY;
// Exported ROM declarations
void DrawWholeMapView(void);