diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
| commit | c94e5e9ab0b2b65c8c6275f84043807b2743d6f2 (patch) | |
| tree | b188427bb1942695f32e14ee3fe137855d638c8c /src/field_camera.c | |
| parent | 0643255c85d0ebd5212e731c9fad3b43d0d99a10 (diff) | |
| parent | ed16a7409ae9c808a110975dec1930f9f949a6d6 (diff) | |
Merge remote-tracking branch 'upstream/master' into port_matchings
Diffstat (limited to 'src/field_camera.c')
| -rw-r--r-- | src/field_camera.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_camera.c b/src/field_camera.c index f383b2a27..37133d68f 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -84,10 +84,10 @@ void FieldUpdateBgTilemapScroll(void) SetGpuReg(REG_OFFSET_BG3VOFS, r4); } -void sub_805A658(s16 *a, s16 *b) +void FieldCameraGetPixelOffsetAtGround(s16 *hofs_p, s16 *vofs_p) { - *a = sFieldCameraOffset.xPixelOffset + sHorizontalCameraPan; - *b = sFieldCameraOffset.yPixelOffset + sVerticalCameraPan + 8; + *hofs_p = sFieldCameraOffset.xPixelOffset + sHorizontalCameraPan; + *vofs_p = sFieldCameraOffset.yPixelOffset + sVerticalCameraPan + 8; } void DrawWholeMapView(void) |