diff options
author | Frogg <froggestspirit@gmail.com> | 2021-04-10 19:04:59 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-10 19:04:59 -0400 |
commit | ec6b1ea3735ff98a9714b219e4a999894ecc6010 (patch) | |
tree | fff7823aa15ce633de1bc4132574c1d081a84a93 /src/field_camera.c | |
parent | 677b4fc394516deab5b5c86c94a2a1443cb52151 (diff) | |
parent | 09a9efd5c57909c215a66b85f3255190c8882940 (diff) |
Merge pull request #2 from pret/master
update
Diffstat (limited to 'src/field_camera.c')
-rw-r--r-- | src/field_camera.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/field_camera.c b/src/field_camera.c index 699b984ac..a36b6883c 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -39,7 +39,7 @@ static void CameraPanningCB_PanAhead(void); static struct FieldCameraOffset sFieldCameraOffset; static s16 sHorizontalCameraPan; static s16 sVerticalCameraPan; -static bool8 gUnknown_03000E2C; +static bool8 sBikeCameraPanFlag; static void (*sFieldCameraPanningCallback)(void); struct CameraObject gFieldCamera; @@ -89,7 +89,7 @@ void FieldUpdateBgTilemapScroll(void) SetGpuReg(REG_OFFSET_BG3VOFS, r4); } -void sub_8089C08(s16 *x, s16 *y) +void GetCameraOffsetWithPan(s16 *x, s16 *y) { *x = sFieldCameraOffset.xPixelOffset + sHorizontalCameraPan; *y = sFieldCameraOffset.yPixelOffset + sVerticalCameraPan + 8; @@ -450,7 +450,7 @@ void SetCameraPanning(s16 a, s16 b) void InstallCameraPanAheadCallback(void) { sFieldCameraPanningCallback = CameraPanningCB_PanAhead; - gUnknown_03000E2C = FALSE; + sBikeCameraPanFlag = FALSE; sHorizontalCameraPan = 0; sVerticalCameraPan = 32; } @@ -474,16 +474,16 @@ static void CameraPanningCB_PanAhead(void) } else { - // this code is never reached. + // this code is never reached if (gPlayerAvatar.tileTransitionState == T_TILE_TRANSITION) { - gUnknown_03000E2C ^= 1; - if (gUnknown_03000E2C == FALSE) + sBikeCameraPanFlag ^= 1; + if (sBikeCameraPanFlag == FALSE) return; } else { - gUnknown_03000E2C = FALSE; + sBikeCameraPanFlag = FALSE; } var = GetPlayerMovementDirection(); |