From 97633044c4287a26f10601ddc8bcccaacc79c979 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Sat, 30 Dec 2023 12:02:31 -0500 Subject: [PATCH] Make it so player 1 can control the credits camera --- src/game/camera.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/game/camera.c b/src/game/camera.c index dbc0be219..c00b0e79e 100644 --- a/src/game/camera.c +++ b/src/game/camera.c @@ -7382,15 +7382,12 @@ void reset_pan_distance(UNUSED struct Camera *c) { * Easter egg: the player 2 controller can move the camera's focus in the ending and credits. */ void player2_rotate_cam(struct Camera *c, s16 minPitch, s16 maxPitch, s16 minYaw, s16 maxYaw) { - // disable for co-op - return; - f32 distCamToFocus; s16 pitch, yaw, pitchCap; // Change the camera rotation to match the 2nd player's stick - approach_s16_asymptotic_bool(&sCreditsPlayer2Yaw, -(s16)(gPlayer2Controller->stickX * 250.f), 4); - approach_s16_asymptotic_bool(&sCreditsPlayer2Pitch, -(s16)(gPlayer2Controller->stickY * 265.f), 4); + approach_s16_asymptotic_bool(&sCreditsPlayer2Yaw, -(s16)(gPlayer1Controller->stickX * 250.f), 4); + approach_s16_asymptotic_bool(&sCreditsPlayer2Pitch, -(s16)(gPlayer1Controller->stickY * 265.f), 4); vec3f_get_dist_and_angle(c->pos, c->focus, &distCamToFocus, &pitch, &yaw); pitchCap = 0x3800 - pitch; if (pitchCap < 0) {