diff options
author | garak <garakmon@gmail.com> | 2019-07-20 12:30:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-20 12:30:41 -0400 |
commit | c39d25ff4d3cf6cb8b3a6fea208de0cc3c6a7c8c (patch) | |
tree | bce0030d8901a6b84e705baca169989fff1a4f71 /src/field_camera.c | |
parent | dfa3e079c0f55565fc60a6a1ba0ef04de9be94c2 (diff) | |
parent | 4d5c1ca03b4e7db3c44c71afaa01b1549a282a19 (diff) |
Merge branch 'master' into navdata
Diffstat (limited to 'src/field_camera.c')
-rw-r--r-- | src/field_camera.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/field_camera.c b/src/field_camera.c index b976cf2ff..7f294afdb 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -36,11 +36,11 @@ static void DrawMetatile(s32 a, u16 *b, u16 c); static void CameraPanningCB_PanAhead(void); // IWRAM bss vars -static IWRAM_DATA struct FieldCameraOffset sFieldCameraOffset; -static IWRAM_DATA s16 sHorizontalCameraPan; -static IWRAM_DATA s16 sVerticalCameraPan; -static IWRAM_DATA u8 gUnknown_03000E2C; -static IWRAM_DATA void (*sFieldCameraPanningCallback)(void); +static struct FieldCameraOffset sFieldCameraOffset; +static s16 sHorizontalCameraPan; +static s16 sVerticalCameraPan; +static u8 gUnknown_03000E2C; +static void (*sFieldCameraPanningCallback)(void); struct CameraObject gFieldCamera; u16 gTotalCameraPixelOffsetY; |