diff options
| author | mzxrules <mzxrules@gmail.com> | 2024-10-12 22:28:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-12 22:28:55 -0400 |
| commit | eee7ba9bd574631c58837a92463e0a4d6a28cae6 (patch) | |
| tree | 1e65385f3308b8c269e7ace37b6dd30e8ce9cbb4 /src/code | |
| parent | 44460eeaec1824f4e361e1e243c06862cbf4f8c8 (diff) | |
Rename RoomBehaviorType2 (#2270)
* Rename RoomBehavior2
* fig proposal
* fig comment
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_camera.c | 2 | ||||
| -rw-r--r-- | src/code/z_player_lib.c | 2 | ||||
| -rw-r--r-- | src/code/z_scene.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 053151a42..4281b15c0 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -7881,7 +7881,7 @@ s32 Camera_UpdateWater(Camera* camera) { s32 Camera_UpdateHotRoom(Camera* camera) { camera->distortionFlags &= ~DISTORTION_HOT_ROOM; - if (camera->play->roomCtx.curRoom.behaviorType2 == ROOM_BEHAVIOR_TYPE2_3) { + if (camera->play->roomCtx.curRoom.environmentType == ROOM_ENV_HOT) { camera->distortionFlags |= DISTORTION_HOT_ROOM; } diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 1699dd200..5c0318064 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -928,7 +928,7 @@ s32 Player_GetEnvironmentalHazard(PlayState* play) { EnvHazardTextTriggerEntry* triggerEntry; s32 envHazard; - if (play->roomCtx.curRoom.behaviorType2 == ROOM_BEHAVIOR_TYPE2_3) { // Room is hot + if (play->roomCtx.curRoom.environmentType == ROOM_ENV_HOT) { // Room is hot envHazard = PLAYER_ENV_HAZARD_HOTROOM - 1; } else if ((this->underwaterTimer > 80) && ((this->currentBoots == PLAYER_BOOTS_IRON) || (this->underwaterTimer >= 300))) { diff --git a/src/code/z_scene.c b/src/code/z_scene.c index f96005a4a..13dce2d48 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -262,7 +262,7 @@ BAD_RETURN(s32) Scene_CommandSpecialFiles(PlayState* play, SceneCmd* cmd) { BAD_RETURN(s32) Scene_CommandRoomBehavior(PlayState* play, SceneCmd* cmd) { play->roomCtx.curRoom.behaviorType1 = cmd->roomBehavior.gpFlag1; - play->roomCtx.curRoom.behaviorType2 = cmd->roomBehavior.gpFlag2 & 0xFF; + play->roomCtx.curRoom.environmentType = cmd->roomBehavior.gpFlag2 & 0xFF; play->roomCtx.curRoom.lensMode = (cmd->roomBehavior.gpFlag2 >> 8) & 1; play->msgCtx.disableWarpSongs = (cmd->roomBehavior.gpFlag2 >> 0xA) & 1; } |