diff options
Diffstat (limited to 'src/code/z_camera.c')
| -rw-r--r-- | src/code/z_camera.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c index b2570386f..72e017e50 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -7027,18 +7027,18 @@ void func_800DDFE0(Camera* camera) { camera->prevSetting = camera->setting = CAM_SET_FREE0; Camera_UnsetStateFlag(camera, CAM_STATE_2); } else { - switch (camera->play->roomCtx.curRoom.behaviorType1) { - case ROOM_BEHAVIOR_TYPE1_1: + switch (camera->play->roomCtx.curRoom.type) { + case ROOM_TYPE_DUNGEON: camera->prevSetting = CAM_SET_DUNGEON0; Camera_ChangeSettingFlags(camera, CAM_SET_DUNGEON0, CAM_CHANGE_SETTING_1); break; - case ROOM_BEHAVIOR_TYPE1_0: + case ROOM_TYPE_NORMAL: camera->prevSetting = CAM_SET_NORMAL0; Camera_ChangeSettingFlags(camera, CAM_SET_NORMAL0, CAM_CHANGE_SETTING_1); break; - case ROOM_BEHAVIOR_TYPE1_2: + case ROOM_TYPE_INDOORS: camera->prevSetting = CAM_SET_ROOM0; Camera_ChangeSettingFlags(camera, CAM_SET_ROOM0, CAM_CHANGE_SETTING_1); break; @@ -7279,7 +7279,7 @@ void Camera_EarthquakeDay3(Camera* camera) { */ s32 Camera_UpdateHotRoom(Camera* camera) { Distortion_RemoveRequest(DISTORTION_TYPE_HOT_ROOM); - if (camera->play->roomCtx.curRoom.behaviorType2 == ROOM_BEHAVIOR_TYPE2_HOT) { + if (camera->play->roomCtx.curRoom.environmentType == ROOM_ENV_HOT) { Distortion_Request(DISTORTION_TYPE_HOT_ROOM); } return true; @@ -7736,7 +7736,7 @@ s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 forceChange) { break; case CAM_CHANGE_MODE_1: - if (camera->play->roomCtx.curRoom.behaviorType1 == ROOM_BEHAVIOR_TYPE1_1) { + if (camera->play->roomCtx.curRoom.type == ROOM_TYPE_DUNGEON) { Audio_PlaySfx(NA_SE_SY_ATTENTION_URGENCY); } else { |