From 9b89ec5fac324f7204cda20ebc4f8527ee49b856 Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Sat, 23 Oct 2021 21:44:45 -0300 Subject: Document `ovl_select` (#966) * Some renames * Some renames * Some more renames * pageDown * Last name update * Translate scene entries * formatter * Review * A bunch of suggestions * Run formatter * Roman's suggestions --- src/code/z_camera.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/code/z_camera.c') diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 9f6483186..fd287f673 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -1690,9 +1690,9 @@ s32 Camera_Normal2(Camera* camera) { anim->unk_20 = BGCAM_ROT(bgData).x; anim->unk_22 = BGCAM_ROT(bgData).y; anim->unk_24 = playerPosRot->pos.y; - anim->unk_1C = BGCAM_FOV(bgData) == -1 - ? norm2->unk_14 - : BGCAM_FOV(bgData) >= 0x169 ? PCT(BGCAM_FOV(bgData)) : BGCAM_FOV(bgData); + anim->unk_1C = BGCAM_FOV(bgData) == -1 ? norm2->unk_14 + : BGCAM_FOV(bgData) >= 0x169 ? PCT(BGCAM_FOV(bgData)) + : BGCAM_FOV(bgData); anim->unk_28 = BGCAM_JFIFID(bgData) == -1 ? 0 : BGCAM_JFIFID(bgData); @@ -2920,7 +2920,9 @@ s32 Camera_Battle1(Camera* camera) { } anim->roll += (((OREG(36) * camera->speedRatio) * (1.0f - distRatio)) - anim->roll) * PCT(OREG(37)); camera->roll = DEGF_TO_BINANG(anim->roll); - camera->fov = Camera_LERPCeilF((player->swordState != 0 ? 0.8f : gSaveContext.health <= 0x10 ? 0.8f : 1.0f) * + camera->fov = Camera_LERPCeilF((player->swordState != 0 ? 0.8f + : gSaveContext.health <= 0x10 ? 0.8f + : 1.0f) * (fov - ((fov * 0.05f) * distRatio)), camera->fov, camera->fovUpdateRate, 1.0f); } -- cgit v1.2.3