From 7b3d51d32b140ff6a71ec12a708893c577f7e488 Mon Sep 17 00:00:00 2001 From: Sunk <69110309+Sunketchupm@users.noreply.github.com> Date: Sun, 27 Apr 2025 23:26:27 -0400 Subject: [PATCH] Fix `off` setting for romhack camera (#775) This fixes the bug where the camera is immediately centered onto the player, behind the player, in every course when romhack camera is turned off. --- src/game/camera.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/game/camera.c b/src/game/camera.c index 55547ad29..6558a0ed5 100644 --- a/src/game/camera.c +++ b/src/game/camera.c @@ -12203,11 +12203,13 @@ s32 snap_to_45_degrees(s16 angle) { void romhack_camera_init_settings(void) { if (gRomhackCameraSettings.modsOnly) { return; } - enum RomhackCameraOverride override = RCO_DISABLE; + enum RomhackCameraOverride override = RCO_NONE; if (configEnableRomhackCamera == RCE_AUTOMATIC) { override = configRomhackCameraBowserFights ? RCO_ALL : RCO_ALL_EXCEPT_BOWSER; } else if (configEnableRomhackCamera == RCE_ON) { override = configRomhackCameraBowserFights ? RCO_ALL_INCLUDING_VANILLA : RCO_ALL_VANILLA_EXCEPT_BOWSER; + } else if (configEnableRomhackCamera == RCE_OFF && gRomhackCameraSettings.enable != RCO_NONE) { + override = RCO_DISABLE; } gRomhackCameraSettings.enable = override;