diff options
| author | SatoMew <SatoMew@users.noreply.github.com> | 2019-08-04 20:35:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-04 20:35:38 +0100 |
| commit | 667f0837e2c0fecb03e4198a182cf04624a47fbd (patch) | |
| tree | 4f11ff910478fdb34a4c40c465b30be2ac1a22da /src/field_camera.c | |
| parent | 89da828794d036e33ef313ab95868c8be6bb039f (diff) | |
| parent | ce941e6f56803b389c20a52c0a5b89f5ade12b7a (diff) | |
Merge branch 'master' into master
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; |