Fix camera issues (#726)

* Fix vanilla camera in automatic

* Correct dpad movement direction

Matches the same direction as romhack camera now
This commit is contained in:
Sunk 2025-03-31 22:28:12 -04:00 committed by GitHub
parent a318792365
commit af15844a69
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -12212,7 +12212,7 @@ void romhack_camera_init_settings(void) {
}
gRomhackCameraSettings.enable = override;
gCameraUseCourseSpecificSettings = (override == RCO_DISABLE && dynos_level_is_vanilla_level(gCurrLevelNum));
gCameraUseCourseSpecificSettings = (dynos_level_is_vanilla_level(gCurrLevelNum));
gRomhackCameraSettings.collisions = configRomhackCameraHasCollision;
gRomhackCameraSettings.centering = configRomhackCameraHasCentering;
gRomhackCameraSettings.dpad = configRomhackCameraDPadBehavior;
@ -12371,9 +12371,9 @@ void mode_rom_hack_camera(struct Camera *c) {
if (gMarioStates[0].controller->buttonPressed & U_JPAD) {
sRomHackYaw = DEGREES(180 + 90) - gMarioStates[0].faceAngle[1];
} else if (gMarioStates[0].controller->buttonDown & L_JPAD) {
sRomHackYaw -= DEGREES(0.5) * (camera_config_is_x_inverted() ? -1 : 1);
sRomHackYaw -= DEGREES(0.5) * (camera_config_is_x_inverted() ? 1 : -1);
} else if (gMarioStates[0].controller->buttonDown & R_JPAD) {
sRomHackYaw += DEGREES(0.5) * (camera_config_is_x_inverted() ? -1 : 1);
sRomHackYaw += DEGREES(0.5) * (camera_config_is_x_inverted() ? 1 : -1);
} else if (gMarioStates[0].controller->buttonPressed & D_JPAD) {
sRomHackYaw = snap_to_45_degrees(sRomHackYaw);
}