Fix water camera and TTM star cutscene
This commit is contained in:
parent
887ecd8266
commit
74fcd973d1
|
@ -2967,7 +2967,7 @@ void set_camera_mode(struct Camera *c, s16 mode, s16 frames) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mode != CAMERA_MODE_NEWCAM && gLakituState.mode != CAMERA_MODE_NEWCAM) {
|
if (mode != CAMERA_MODE_NEWCAM && gLakituState.mode != CAMERA_MODE_NEWCAM) {
|
||||||
if (mode != CAMERA_MODE_WATER_SURFACE && gCurrLevelArea != AREA_TTM_OUTSIDE) {
|
if (!(mode == CAMERA_MODE_WATER_SURFACE && gCurrLevelArea == AREA_TTM_OUTSIDE)) {
|
||||||
// Clear movement flags that would affect the transition
|
// Clear movement flags that would affect the transition
|
||||||
gCameraMovementFlags &= (u16)~(CAM_MOVE_RESTRICT | CAM_MOVE_ROTATE);
|
gCameraMovementFlags &= (u16)~(CAM_MOVE_RESTRICT | CAM_MOVE_ROTATE);
|
||||||
gCameraMovementFlags |= CAM_MOVING_INTO_MODE;
|
gCameraMovementFlags |= CAM_MOVING_INTO_MODE;
|
||||||
|
|
Loading…
Reference in New Issue